diff --git a/openid-connect-server/src/main/webapp/resources/mockup/approve_test.html b/openid-connect-server/src/main/webapp/resources/mockup/approve_test.html
deleted file mode 100644
index c29197be6..000000000
--- a/openid-connect-server/src/main/webapp/resources/mockup/approve_test.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>OpenID Connect</title>
-    <meta name="description" content="">
-    <meta name="author" content="">
-
-    <!-- Le javascript -->
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="../bootstrap/js/bootstrap-modal.js"></script>
-    <script src="../bootstrap/js/bootstrap-alerts.js"></script>
-    <script src="../bootstrap/js/bootstrap-twipsy.js"></script>
-    <script src="../bootstrap/js/bootstrap-popover.js"></script>
-    <script src="../bootstrap/js/bootstrap-dropdown.js"></script>
-    <script src="../bootstrap/js/bootstrap-scrollspy.js"></script>
-    <script src="../bootstrap/js/bootstrap-tabs.js"></script>
-    <script src="../bootstrap/js/bootstrap-buttons.js"></script>
-    <script src="../js/tmpl.js"></script>
-
-    <script>$(function () {
-
-        var ExampleOpenIdClient = {
-            name:"A name",
-            redirectURL:"http://myURL.domain",
-            grantType:["my grant type 1", "my grant type 2"],
-            scope:["scope 1", "scope 2"],
-            authority:"my authority",
-            description:"my description",
-            refreshTokens:false
-        };
-
-        console.log(tmpl('client_tmpl',ExampleOpenIdClient));
-
-        $('#client-table').append(tmpl('client_tmpl',ExampleOpenIdClient));
-
-    })</script>
-
-    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
-    <!--[if lt IE 9]>
-    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <!-- Le styles -->
-    <link href="../bootstrap/bootstrap.css" rel="stylesheet">
-    <style type="text/css">
-        body {
-            padding-top: 60px;
-        }
-
-        .logo {
-            background: url("../images/openid_small.png") no-repeat left center;
-            padding-left: 30px;
-        }
-    </style>
-
-    <!-- Le fav and touch icons -->
-    <link rel="shortcut icon" href="images/favicon.ico">
-    <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
-</head>
-
-<body>
-
-
-<div class="topbar">
-    <div class="topbar-inner">
-        <div class="container-fluid">
-            <a class="brand" href="#"><span class="logo">OpenID Connect Server</span></a>
-            <ul class="nav">
-                <li class="active"><a href="#">Home</a></li>
-                <li><a href="#about">About</a></li>
-                <li><a href="#about">Statistics</a></li>
-                <li><a href="#contact">Contact</a></li>
-            </ul>
-            <p class="pull-right">Logged in as <a href="#">username</a></p>
-        </div>
-    </div>
-</div>
-
-<div class="container">
-    <div class="content">
-
-        <div class="alert-message error">
-            <a href="#" class="close">&times;</a>
-            <p><strong>Oh snap!</strong> Change this and that and <a href="#">try again</a>.</p>
-        </div>
-
-        <div class="hero-unit" style="text-align:center">
-            <h1>Please Confirm!</h1>
-            <p>I hereby authorize http://domain.com to access my protected resources.</p>
-            <p><a class="btn success large">Approve</a>&nbsp;<a class="btn secondary large">Deny</a></p>
-
-                <a href="#" class="small">learn more</a>
-
-        </div>
-        <footer>
-            <p>&copy; Company 2012</p>
-        </footer>
-    </div>
-</div>
-
-</body>
-</html>
diff --git a/openid-connect-server/src/main/webapp/resources/mockup/bootstrap2_test.html b/openid-connect-server/src/main/webapp/resources/mockup/bootstrap2_test.html
deleted file mode 100644
index 38a663d97..000000000
--- a/openid-connect-server/src/main/webapp/resources/mockup/bootstrap2_test.html
+++ /dev/null
@@ -1,139 +0,0 @@
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>Bootstrap, from Twitter</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="">
-    <meta name="author" content="">
-
-    <!-- Le styles -->
-    <link href="../bootstrap2/css/bootstrap.css" rel="stylesheet">
-    <link href="../bootstrap2/css/bootstrap-responsive.css" rel="stylesheet">
-
-    <style type="text/css">
-        body {
-            padding-top: 60px;
-            padding-bottom: 40px;
-        }
-        .sidebar-nav {
-            padding: 9px 0;
-        }
-
-        h1,label {
-            text-shadow: 1px 1px 1px #FFFFFF;
-        }
-
-        .brand {
-            background: url("../images/openid_small.png") no-repeat scroll 7px 7px transparent;
-        }
-    </style>
-
-    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
-    <!--[if lt IE 9]>
-    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <!-- Le fav and touch icons -->
-    <link rel="shortcut icon" href="../bootstrap2/ico/favicon.ico">
-    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../bootstrap2/ico/apple-touch-icon-114-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../bootstrap2/ico/apple-touch-icon-72-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" href="../bootstrap2/ico/apple-touch-icon-57-precomposed.png">
-</head>
-
-<body>
-
-<div class="navbar navbar-fixed-top">
-    <div class="navbar-inner">
-        <div class="container-fluid">
-            <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </a>
-            <a class="brand" style="padding-left: 35px" href="#">OpenID Connect Server</a>
-            <div class="nav-collapse">
-                <ul class="nav">
-                    <li class="active"><a href="#">Home</a></li>
-                    <li><a href="#about">About</a></li>
-                    <li><a href="#contact">Statistics</a></li>
-                    <li><a href="#contact">Contact</a></li>
-                </ul>
-                <p class="navbar-text pull-right">Logged in as <a href="#">username</a></p>
-            </div><!--/.nav-collapse -->
-        </div>
-    </div>
-</div>
-
-<div class="container-fluid">
-    <div class="row-fluid">
-        <div class="span2">
-            <div class="well sidebar-nav">
-                <ul class="nav nav-list">
-                    <li class="nav-header">Administrative</li>
-                    <li><a href="#">Manage Clients</a></li>
-                    <li><a href="#">White Lists</a></li>
-                    <li><a href="#">Black Lists</a></li>
-                    <li class="nav-header">Personal</li>
-                    <li><a href="#">Manage Sites</a></li>
-                    <li><a href="#">Manage Active Tokens</a></li>
-                    <li><a href="#">Manage Profiles</a></li>
-                </ul>
-            </div><!--/.well -->
-        </div><!--/span-->
-        <div class="span10">
-            <div class="hero-unit">
-                <h1>Hello, world!</h1>
-                <p>This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.</p>
-                <p><a class="btn btn-primary btn-large">Learn more &raquo;</a></p>
-            </div>
-            <div class="row-fluid">
-                <div class="span4">
-                    <h2>Heading</h2>
-                    <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
-                    <p><a class="btn" href="#">View details &raquo;</a></p>
-                </div><!--/span-->
-                <div class="span4">
-                    <h2>Heading</h2>
-                    <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
-                    <p><a class="btn" href="#">View details &raquo;</a></p>
-                </div><!--/span-->
-                <div class="span4">
-                    <h2>Heading</h2>
-                    <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
-                    <p><a class="btn" href="#">View details &raquo;</a></p>
-                </div><!--/span-->
-            </div><!--/row-->
-            <div class="row-fluid">
-                <div class="span4">
-                    <h2>Heading</h2>
-                    <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
-                    <p><a class="btn" href="#">View details &raquo;</a></p>
-                </div><!--/span-->
-                <div class="span4">
-                    <h2>Heading</h2>
-                    <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
-                    <p><a class="btn" href="#">View details &raquo;</a></p>
-                </div><!--/span-->
-                <div class="span4">
-                    <h2>Heading</h2>
-                    <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
-                    <p><a class="btn" href="#">View details &raquo;</a></p>
-                </div><!--/span-->
-            </div><!--/row-->
-        </div><!--/span-->
-    </div><!--/row-->
-
-    <hr>
-
-    <footer>
-        <p>&copy; Company 2012</p>
-    </footer>
-
-</div><!--/.fluid-container-->
-
-
-
-</body>
-</html>
diff --git a/openid-connect-server/src/main/webapp/resources/mockup/edit_client.html b/openid-connect-server/src/main/webapp/resources/mockup/edit_client.html
deleted file mode 100644
index ee10f2b07..000000000
--- a/openid-connect-server/src/main/webapp/resources/mockup/edit_client.html
+++ /dev/null
@@ -1,255 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>OpenID Connect</title>
-
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="">
-    <meta name="author" content="">
-
-    <!-- Le styles -->
-    <link href="../bootstrap2/css/bootstrap.css" rel="stylesheet">
-    <style type="text/css">
-        body {
-            padding-top: 60px;
-            padding-bottom: 40px;
-        }
-
-        .sidebar-nav {
-            padding: 9px 0;
-        }
-    </style>
-    <link href="../bootstrap2/css/bootstrap-responsive.css" rel="stylesheet">
-
-
-    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
-    <!--[if lt IE 9]>
-    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-
-    <style type="text/css">
-        body {
-            padding-top: 60px;
-        }
-
-        h1, label {
-            text-shadow: 1px 1px 1px #FFFFFF;
-        }
-
-        .brand {
-            background: url("../images/openid_small.png") no-repeat left center;
-            padding-left: 30px;
-        }
-    </style>
-
-    <!-- Le fav and touch icons -->
-    <link rel="shortcut icon" href="images/favicon.ico">
-    <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
-</head>
-
-<body>
-
-
-<div class="navbar navbar-fixed-top">
-    <div class="navbar-inner">
-        <div class="container-fluid">
-            <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </a>
-            <a class="brand" href="#">Project name</a>
-
-            <div class="nav-collapse">
-                <ul class="nav">
-                    <li class="active"><a href="#">Home</a></li>
-                    <li><a href="#about">About</a></li>
-                    <li><a href="#contact">Contact</a></li>
-                </ul>
-                <p class="navbar-text pull-right">Logged in as <a href="#">username</a></p>
-            </div>
-            <!--/.nav-collapse -->
-        </div>
-    </div>
-</div>
-
-<div class="container-fluid">
-    <div class="row-fluid">
-        <div class="sidebar span-3">
-            <div class="well">
-                <h5>Administrative</h5>
-                <ul>
-                    <li><a href="#">Manage Clients</a></li>
-                    <li><a href="#">White Lists</a></li>
-                    <li><a href="#">Black Lists</a></li>
-                </ul>
-                <h5>Personal</h5>
-                <ul>
-                    <li><a href="#">Manage Sites</a></li>
-                    <li><a href="#">Manage Active Tokens</a></li>
-                    <li><a href="#">Profile</a></li>
-                </ul>
-            </div>
-        </div>
-
-
-        <div class="span9">
-            <div class="">
-                <ul class="breadcrumb">
-                    <li><a href="#">Home</a> <span class="divider">/</span></li>
-                    <li class="active"><a href="#">Manage Clients</a><span class="divider">/</span></li>
-                    Edit Client
-                </ul>
-
-
-                <h1>Edit Client</h1>
-
-
-                <div class="">
-                    <form>
-                        <fieldset>
-                            <legend>Details</legend>
-
-                            <div class="well">
-
-                                <div class="row-fluid">
-                                    <div class="span6">
-                                        <label>Client name</label>
-                                        <input type="text" class="span3" placeholder="Type something"> <span class="help-inline">Associated help text!</span>
-
-                                        <label>Refresh URL</label>
-                                        <input type="text" class="span3" placeholder="http://"><span class="help-inline">Associated help text!</span>
-                                    </div>
-                                    <div class="span6">
-                                        <label>Description</label>
-                                        <textarea class="input-xlarge" id="textarea" placeholder="Type a description" rows="3"></textarea> <span class="help-inline">Associated help text!</span>
-                                    </div>
-                                </div>
-
-                                <hr>
-
-                                <div class="">
-                                    <p class="help-block">Refresh tokens allow clients to request another authorization
-                                        token after it
-                                        expires.</p>
-                                    <label class="checkbox">
-                                        <input type="checkbox"> Allow refresh tokens?
-                                    </label>
-                                    <button type="submit" class="btn btn-primary">Submit</button>
-                                </div>
-                            </div>
-                        </fieldset>
-                        <fieldset>
-                            <legend>Additional Options</legend>
-
-                            <div class="row-fluid">
-
-                                <div class="span4 control-group">
-
-                                    <label class="control-label">Grant Types</label>
-
-                                    <div class="controls">
-                                        <label class="checkbox">
-                                            <input type="checkbox" name="grant-type-checkbox-list1" value="option1">
-                                            Option one
-                                        </label>
-                                        <label class="checkbox">
-                                            <input type="checkbox" name="grant-type-checkbox-list2" value="option2">
-                                            Option two
-                                        </label>
-                                        <label class="checkbox">
-                                            <input type="checkbox" name="grant-type-checkbox-list3" value="option3">
-                                            Option three
-                                        </label>
-
-                                        <p class="help-block"><strong>Note:</strong> Labels surround all the options for
-                                            much larger click areas and a more usable form.</p>
-                                    </div>
-
-                                </div>
-
-                                <div class="span4 control-group">
-
-                                    <label class="control-label">Auth Types</label>
-
-                                    <div class="controls">
-                                        <label class="checkbox">
-                                            <input type="checkbox" name="auth-type-checkbox-list1" value="option1">
-                                            Option one
-                                        </label>
-                                        <label class="checkbox">
-                                            <input type="checkbox" name="auth-type-checkbox-list2" value="option2">
-                                            Option two
-                                        </label>
-                                        <label class="checkbox">
-                                            <input type="checkbox" name="auth-type-checkbox-list3" value="option3">
-                                            Option three
-                                        </label>
-
-                                        <p class="help-block"><strong>Note:</strong> Labels surround all the options for
-                                            much larger click areas and a more usable form.</p>
-                                    </div>
-
-                                </div>
-
-                                <div class="span4 control-group">
-                                    <label class="control-label" for="access-token-timeout-seconds" style="">Access Token Timeout</label>
-
-                                    <div class="controls form-horizontal" style="">
-                                        <div class="input-append">
-                                            <input type="text" class="span2" id="access-token-timeout-seconds" size="16"><span class="add-on">seconds</span>
-                                        </div>
-                                        <span class="help-inline">Here's more help text</span>
-                                    </div>
-
-                                    <label class="control-label" for="refresh-token-timeout-seconds" style="">Refresh Token Timeout</label>
-
-                                    <div class="controls form-horizontal" style="">
-                                        <div class="input-append">
-                                            <input type="text" class="span2" id="refresh-token-timeout-seconds" size="16"><span class="add-on">seconds</span>
-                                        </div>
-                                        <span class="help-inline">Here's more help text</span>
-                                    </div>
-
-                                </div>
-
-
-                                <div class="span12 control-group">
-                                    <label for="textarea2">Scope</label>
-
-                                    <div class="input">
-                                        <textarea rows="3" class="xlarge span10" placeholder="email,first name, last name" id="textarea2" name="textarea2"></textarea>
-              <span class="help-block">
-                Please enter scopes separated by commas
-              </span>
-                                    </div>
-                                </div>
-
-
-                            </div>
-                        </fieldset>
-                    </form>
-                </div>
-
-
-            </div>
-
-
-        </div>
-
-
-
-    </div>
-
-    <footer>
-        <p>&copy; Company 2012</p>
-    </footer>
-</div>
-
-
-</body>
-</html>
diff --git a/openid-connect-server/src/main/webapp/resources/mockup/main.html b/openid-connect-server/src/main/webapp/resources/mockup/main.html
deleted file mode 100644
index 5f1c5d3d4..000000000
--- a/openid-connect-server/src/main/webapp/resources/mockup/main.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>OpenID Connect</title>
-    <meta name="description" content="">
-    <meta name="author" content="">
-
-    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
-    <!--[if lt IE 9]>
-    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <!-- Le styles -->
-    <link href="../bootstrap/bootstrap.css" rel="stylesheet">
-    <style type="text/css">
-        body {
-            padding-top: 60px;
-        }
-
-        .logo {
-            background: url("../images/openid_small.png") no-repeat left center;
-            padding-left: 30px;
-        }
-    </style>
-
-    <!-- Le fav and touch icons -->
-    <link rel="shortcut icon" href="images/favicon.ico">
-    <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
-</head>
-
-<body>
-
-<div class="topbar">
-    <div class="topbar-inner">
-        <div class="container-fluid">
-            <a class="brand" href="#"><span class="logo">OpenID Connect Server</span></a>
-            <ul class="nav">
-                <li class="active"><a href="#">Home</a></li>
-                <li><a href="#about">About</a></li>
-                <li><a href="#about">Statistics</a></li>
-                <li><a href="#contact">Contact</a></li>
-            </ul>
-            <p class="pull-right">Logged in as <a href="#">username</a></p>
-        </div>
-    </div>
-</div>
-
-<div class="container-fluid">
-    <div class="sidebar">
-        <div class="well">
-            <h5>Administrative</h5>
-            <ul>
-                <li><a href="#">Manage Clients</a></li>
-                <li><a href="#">White Lists</a></li>
-                <li><a href="#">Black Lists</a></li>
-            </ul>
-            <h5>Personal</h5>
-            <ul>
-                <li><a href="#">Manage Sites</a></li>
-                <li><a href="#">Manage Active Tokens</a></li>
-                <li><a href="#">Profile</a></li>
-            </ul>
-        </div>
-    </div>
-    <div class="content">
-        <!-- Main hero unit for a primary marketing message or call to action -->
-        <div class="hero-unit">
-            <h1>Welcome, User Name!</h1>
-
-            <p>Can't remember your passwords? Tired of filling out registration forms?
-                OpenID is a <strong>safe</strong>, <strong>faster</strong>, and <strong>easier</strong> way to log in to
-                web sites.</p>
-
-            <p><a class="btn primary large" href="http://openid.net/connect/">Learn more &raquo;</a></p>
-        </div>
-        <!-- Example row of columns -->
-        <div class="row">
-            <div class="span8">
-                <h2>About</h2>
-
-                <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo,
-                    tortor
-                    mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada
-                    magna
-                    mollis euismod. Donec sed odio dui. </p>
-
-                <p><a class="btn" href="#">More &raquo;</a></p>
-            </div>
-            <div class="span8">
-                <h2>Contact</h2>
-
-                <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo,
-                    tortor
-                    mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada
-                    magna
-                    mollis euismod. Donec sed odio dui. </p>
-
-                <p><a class="btn" href="#">Email &raquo;</a></p>
-            </div>
-
-        </div>
-        <hr>
-        <!-- Example row of columns -->
-        <div class="row">
-            <div class="span16">
-                <h2>Current Statistics</h2>
-
-                <p>You'll be keen to know that there have been <span class="label notice">4720</span> users of this
-                    system who have logged in to
-                    <span class="label notice">203</span>
-                    total sites, for a total of <span class="label notice">6224</span> site approvals.</p>
-
-            </div>
-        </div>
-
-        <footer>
-            <p>&copy; Company 2012</p>
-        </footer>
-    </div>
-</div>
-
-</body>
-</html>
diff --git a/openid-connect-server/src/main/webapp/resources/mockup/manage_client_test.html b/openid-connect-server/src/main/webapp/resources/mockup/manage_client_test.html
deleted file mode 100644
index 54277e1a4..000000000
--- a/openid-connect-server/src/main/webapp/resources/mockup/manage_client_test.html
+++ /dev/null
@@ -1,119 +0,0 @@
-
-
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-
-
-    <base href="../../" />
-
-    <meta charset="utf-8">
-    <title>OpenID Connect - welcome</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="">
-    <meta name="author" content="">
-
-    <!-- Le styles -->
-    <link href="resources/bootstrap2/css/bootstrap.css" rel="stylesheet">
-    <link href="resources/bootstrap2/css/bootstrap-responsive.css" rel="stylesheet">
-
-    <style type="text/css">
-        body {
-            padding-top: 60px;
-            padding-bottom: 40px;
-        }
-        .sidebar-nav {
-            padding: 9px 0;
-        }
-
-        h1,label {
-            text-shadow: 1px 1px 1px #FFFFFF;
-        }
-
-        .brand {
-            background: url("resources/images/openid_small.png") no-repeat scroll 7px 7px transparent;
-        }
-    </style>
-
-    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
-    <!--[if lt IE 9]>
-    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <!-- Le fav and touch icons -->
-    <link rel="shortcut icon" href="../bootstrap2/ico/favicon.ico">
-    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../bootstrap2/ico/apple-touch-icon-114-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../bootstrap2/ico/apple-touch-icon-72-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" href="../bootstrap2/ico/apple-touch-icon-57-precomposed.png">
-</head>
-
-<body><div class="navbar navbar-fixed-top">
-    <div class="navbar-inner">
-        <div class="container-fluid">
-            <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </a>
-            <a class="brand" style="padding-left: 35px" href="#">OpenID Connect Server</a>
-            <div class="nav-collapse">
-                <ul class="nav">
-                    <li class="active"><a href="#">Home</a></li>
-                    <li><a href="#about">About</a></li>
-                    <li><a href="#contact">Statistics</a></li>
-                    <li><a href="#contact">Contact</a></li>
-                </ul>
-                <p class="navbar-text pull-right">Logged in as <a href="#">username</a></p>
-            </div><!--/.nav-collapse -->
-        </div>
-    </div>
-</div><div class="container-fluid">
-    <div class="row-fluid">
-        <div class="span2">
-            <div class="well sidebar-nav">
-                <ul class="nav nav-list">
-                    <li class="nav-header">Administrative</li>
-                    <li><a href="admin/manage/clients">Manage Clients</a></li>
-                    <li><a href="#">White Lists</a></li>
-                    <li><a href="#">Black Lists</a></li>
-                    <li class="nav-header">Personal</li>
-                    <li><a href="#">Manage Sites</a></li>
-                    <li><a href="#">Manage Active Tokens</a></li>
-                    <li><a href="#">Manage Profiles</a></li>
-                </ul>
-            </div><!--/.well -->
-        </div><!--/span--><div class="span10">
-        <div class="content">
-
-            <ul class="breadcrumb">
-                <li><a href="#">Home</a> <span class="divider">/</span></li>
-                <li class="active">Manage Clients</li>
-            </ul>
-
-            <div class="well">
-                <label>White list
-                <textarea class="span7" rows="5" id="textarea" class="input-xlarge"></textarea></label>
-                <span class="help-block">Enter URLs separated by a newline.</span>
-
-                <button class="btn">Submit</button>
-            </div>
-
-
-            <footer>
-                <p>&copy; Company 2012</p>
-            </footer></div>
-    </div>
-    </div>
-</div>
-<!-- Le javascript
-================================================== -->
-<!-- Placed at the end of the document so the pages load faster -->
-<script type="text/javascript" src="resources/js/jquery.min.js"></script>
-<script type="text/javascript" src="resources/bootstrap2/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="resources/js/underscore-min.js"></script>
-<script type="text/javascript" src="resources/js/backbone-min.js"></script>
-<script type="text/javascript" src="resources/js/app.js"></script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/openid-connect-server/src/main/webapp/resources/mockup/manage_clients.html b/openid-connect-server/src/main/webapp/resources/mockup/manage_clients.html
deleted file mode 100644
index 1a255cda6..000000000
--- a/openid-connect-server/src/main/webapp/resources/mockup/manage_clients.html
+++ /dev/null
@@ -1,429 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>OpenID Connect</title>
-    <meta name="description" content="">
-    <meta name="author" content="">
-
-    <!-- Le javascript -->
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="../bootstrap/js/bootstrap-modal.js"></script>
-    <script src="../bootstrap/js/bootstrap-alerts.js"></script>
-    <script src="../bootstrap/js/bootstrap-twipsy.js"></script>
-    <script src="../bootstrap/js/bootstrap-popover.js"></script>
-    <script src="../bootstrap/js/bootstrap-dropdown.js"></script>
-    <script src="../bootstrap/js/bootstrap-scrollspy.js"></script>
-    <script src="../bootstrap/js/bootstrap-tabs.js"></script>
-    <script src="../bootstrap/js/bootstrap-buttons.js"></script>
-    <script src="../js/tmpl.js"></script>
-
-    <script>$(function () {
-
-        var ExampleOpenIdClient = {
-            name:"A name",
-            redirectURL:"http://myURL.domain",
-            grantType:["my grant type 1", "my grant type 2"],
-            scope:["scope 1", "scope 2"],
-            authority:"my authority",
-            description:"my description",
-            refreshTokens:false
-        };
-
-        console.log(tmpl('client_tmpl',ExampleOpenIdClient));
-
-        $('#client-table').append(tmpl('client_tmpl',ExampleOpenIdClient));
-
-    })</script>
-
-    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
-    <!--[if lt IE 9]>
-    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <!-- Le styles -->
-    <link href="../bootstrap/bootstrap.css" rel="stylesheet">
-    <style type="text/css">
-        body {
-            padding-top: 60px;
-        }
-
-        .logo {
-            background: url("../images/openid_small.png") no-repeat left center;
-            padding-left: 30px;
-        }
-    </style>
-
-    <!-- Le fav and touch icons -->
-    <link rel="shortcut icon" href="images/favicon.ico">
-    <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
-</head>
-
-<body>
-
-<script type="text/html" id="client_tmpl">
-    <tr>
-        <td><#=name#></td>
-        <td><#=redirectURL#></td>
-        <td>
-            <ul>
-                <# for (var i in grantType) { #>
-                    <li><#=grantType[i]#></li>
-                    <# } #>
-            </ul>
-        </td>
-        <td>
-            <ul>
-                <# for (var i in scope) { #>
-                    <li><#=scope[i]#></li>
-                    <# } #>
-            </ul>
-        </td>
-        <td><#=authority#></td>
-        <td><#=description#>
-        </td>
-        <td><input type="checkbox" "<#=(refreshTokens == 1 ? 'checked' : '')#> value="" id="" name="" disabled></td>
-        <td>
-            <button data-controls-modal="modal-from-dom" data-backdrop="true" data-keyboard="true"
-                    class="btn">edit
-            </button>
-        </td>
-        <td>
-            <button class="btn danger">delete</button>
-        </td>
-    </tr>
-</script>
-
-
-<div id="modal-from-dom" class="modal hide fade" style="width: 577px; max-height: none; top: 35%">
-    <div class="modal-header">
-        <a href="#" class="close">&times;</a>
-
-        <h3>Edit Client</h3>
-    </div>
-    <div class="modal-body">
-
-        <form>
-            <fieldset>
-                <!--<legend>OpenID Client</legend>-->
-                <div class="clearfix">
-                    <label for="xlInput">Client Name</label>
-
-                    <div class="input">
-                        <input type="text" size="30" name="xlInput" id="xlInput" class="xlarge">
-                    </div>
-                </div>
-
-                <div class="clearfix">
-                    <label for="prependedInput">Redirect Url</label>
-
-                    <div class="input">
-                        <div class="input-prepend">
-                            <span class="add-on">http://</span>
-                            <input type="text" size="16" name="prependedInput" id="prependedInput" class="medium">
-                        </div>
-                        <span class="help-block">Url to be redirected</span>
-                    </div>
-                </div>
-
-                <div class="clearfix">
-                    <label id="optionsCheckboxes">Grant Types:</label>
-
-                    <div class="input">
-                        <ul class="inputs-list">
-                            <li>
-                                <label>
-                                    <input type="checkbox" value="option1" name="optionsCheckboxes">
-                                    <span>Grant Type Blah</span>
-                                </label>
-                            </li>
-                            <li>
-                                <label>
-                                    <input type="checkbox" value="option2" name="optionsCheckboxes">
-                                    <span>Grant Type Blah</span>
-                                </label>
-                            </li>
-                            <li>
-                                <label>
-                                    <input type="checkbox" value="option2" name="optionsCheckboxes">
-                                    <span>Grant Type Blah</span>
-                                </label>
-                            </li>
-                        </ul>
-              <span class="help-block">
-                <strong>Note:</strong> Grant type help text.
-              </span>
-                    </div>
-                </div>
-
-                <div class="clearfix">
-                    <label for="textarea2">Scope</label>
-
-                    <div class="input">
-                        <textarea rows="3" name="textarea2" id="textarea2" class="xlarge">email,first name</textarea>
-              <span class="help-block">
-                Please enter scopes separated by commas
-              </span>
-                    </div>
-                </div>
-
-                <div class="clearfix">
-                    <label for="normalSelect">Authority</label>
-
-                    <div class="input">
-                        <select id="normalSelect" name="normalSelect">
-                            <option>My Authority Option 1</option>
-                            <option>My Authority Option 2</option>
-                        </select>
-                    </div>
-                </div>
-
-            </fieldset>
-
-            <div class="clearfix">
-                <label for="form-description">Description</label>
-
-                <div class="input">
-                    <input type="text" size="30" name="form-description" id="form-description" class="xlarge">
-                </div>
-            </div>
-
-            <div class="clearfix">
-                <label id="form-allow-tokens">Allow refresh tokens?</label>
-
-                <div class="input">
-                    <ul class="inputs-list">
-                        <li>
-                            <label>
-                                <input type="checkbox" value="option1" name="form-allow-tokens">
-                                <span>&nbsp;</span>
-                            </label>
-                        </li>
-                    </ul>
-              <span class="help-block">
-                <strong>Note:</strong> Labels surround all the options for much larger click areas and a more usable form.
-              </span>
-                </div>
-            </div>
-
-        </form>
-    </div>
-    <div class="modal-footer">
-        <a href="#" class="btn primary">Save</a>
-        <a href="#" class="btn secondary">Cancel</a>
-    </div>
-</div>
-
-
-<div class="topbar">
-    <div class="topbar-inner">
-        <div class="container-fluid">
-            <a class="brand" href="#"><span class="logo">OpenID Connect Server</span></a>
-            <ul class="nav">
-                <li class="active"><a href="#">Home</a></li>
-                <li><a href="#about">About</a></li>
-                <li><a href="#about">Statistics</a></li>
-                <li><a href="#contact">Contact</a></li>
-            </ul>
-            <p class="pull-right">Logged in as <a href="#">username</a></p>
-        </div>
-    </div>
-</div>
-
-<div class="container-fluid">
-    <div class="sidebar">
-        <div class="well">
-            <h5>Administrative</h5>
-            <ul>
-                <li><a href="#">Manage Clients</a></li>
-                <li><a href="#">White Lists</a></li>
-                <li><a href="#">Black Lists</a></li>
-            </ul>
-            <h5>Personal</h5>
-            <ul>
-                <li><a href="#">Manage Sites</a></li>
-                <li><a href="#">Manage Active Tokens</a></li>
-                <li><a href="#">Profile</a></li>
-            </ul>
-        </div>
-    </div>
-    <div class="content">
-        <div class="">
-            <ul class="breadcrumb">
-                <li><a href="#">Home</a> <span class="divider">/</span></li>
-                <li class="active">Manage Clients</li>
-            </ul>
-
-
-            <h1>Manage Clients</h1>
-
-            <div class="well">
-                <a class="btn small primary" href="#">New Client</a>
-            </div>
-
-            <table id="client-table">
-                <thead>
-                <tr>
-                    <th>Name</th>
-                    <th>Redirect URL</th>
-                    <th>Grant Types</th>
-                    <th>Scope</th>
-                    <th>Authority</th>
-                    <th class="span8">Description</th>
-                    <th>Refresh Tokens</th>
-                    <th class="span1"></th>
-                    <th class="span1"></th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr>
-                    <td>Client Name</td>
-                    <td>http://redirecturl.domain</td>
-                    <td>
-                        <ul>
-                            <li>Grant Type</li>
-                            <li>Grant Type</li>
-                            <li>Grant Type</li>
-                            <li>Grant Type</li>
-                        </ul>
-                    </td>
-                    <td>
-                        <ul>
-                            <li>email</li>
-                            <li>first name</li>
-                            <li>address</li>
-                            <li>last name</li>
-                        </ul>
-                    </td>
-                    <td>My Authority</td>
-                    <td>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo,
-                        tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
-                    </td>
-                    <td><input type="checkbox" checked="checked" value="" id="" name="" disabled></td>
-                    <td>
-                        <button data-controls-modal="modal-from-dom" data-backdrop="true" data-keyboard="true"
-                                class="btn">edit
-                        </button>
-                    </td>
-                    <td>
-                        <button class="btn danger">delete</button>
-                    </td>
-                </tr>
-                <tr>
-                    <td>Client Name</td>
-                    <td>http://redirecturl.domain</td>
-                    <td>
-                        <ul>
-                            <li>Grant Type</li>
-                            <li>Grant Type</li>
-                            <li>Grant Type</li>
-                            <li>Grant Type</li>
-                        </ul>
-                    </td>
-                    <td>
-                        <ul>
-                            <li>email</li>
-                            <li>first name</li>
-                            <li>address</li>
-                            <li>last name</li>
-                        </ul>
-                    </td>
-                    <td>My Authority</td>
-                    <td>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo,
-                        tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
-                    </td>
-                    <td><input type="checkbox" checked="checked" value="" id="" name="" disabled></td>
-                    <td>
-                        <button data-controls-modal="modal-from-dom" data-backdrop="true" data-keyboard="true"
-                                class="btn">edit
-                        </button>
-                    </td>
-                    <td>
-                        <button class="btn danger">delete</button>
-                    </td>
-                </tr>
-                <tr>
-                    <td>Client Name</td>
-                    <td>http://redirecturl.domain</td>
-                    <td>
-                        <ul>
-                            <li>Grant Type</li>
-                            <li>Grant Type</li>
-                            <li>Grant Type</li>
-                            <li>Grant Type</li>
-                        </ul>
-                    </td>
-                    <td>
-                        <ul>
-                            <li>email</li>
-                            <li>first name</li>
-                            <li>address</li>
-                            <li>last name</li>
-                        </ul>
-                    </td>
-                    <td>My Authority</td>
-                    <td>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo,
-                        tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
-                    </td>
-                    <td><input type="checkbox" checked="checked" value="" id="" name="" disabled></td>
-                    <td>
-                        <button data-controls-modal="modal-from-dom" data-backdrop="true" data-keyboard="true"
-                                class="btn">edit
-                        </button>
-                    </td>
-                    <td>
-                        <button class="btn danger">delete</button>
-                    </td>
-                </tr>
-                <tr>
-                    <td>Client Name</td>
-                    <td>http://redirecturl.domain</td>
-                    <td>
-                        <ul>
-                            <li>Grant Type</li>
-                            <li>Grant Type</li>
-                            <li>Grant Type</li>
-                            <li>Grant Type</li>
-                        </ul>
-                    </td>
-                    <td>
-                        <ul>
-                            <li>email</li>
-                            <li>first name</li>
-                            <li>address</li>
-                            <li>last name</li>
-                        </ul>
-                    </td>
-                    <td>My Authority</td>
-                    <td>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo,
-                        tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
-                    </td>
-                    <td><input type="checkbox" checked="checked" value="" id="" name="" disabled></td>
-                    <td>
-                        <button data-controls-modal="modal-from-dom" data-backdrop="true" data-keyboard="true"
-                                class="btn">edit
-                        </button>
-                    </td>
-                    <td>
-                        <button class="btn danger">delete</button>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-
-            <div class="well">
-                <a class="btn small primary" href="#">New Client</a>
-            </div>
-        </div>
-
-
-        <footer>
-            <p>&copy; Company 2012</p>
-        </footer>
-    </div>
-</div>
-
-</body>
-</html>

Name	Redirect URL	Grant Types	Scope	Authority	Description
Client Name	http://redirecturl.domain	- - Grant Type - Grant Type - Grant Type - Grant Type - -	- - email - first name - address - last name - -	My Authority	Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, - tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. -	- -	- -
Client Name	http://redirecturl.domain	- - Grant Type - Grant Type - Grant Type - Grant Type - -	- - email - first name - address - last name - -	My Authority	Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, - tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. -	- -	- -
Client Name	http://redirecturl.domain	- - Grant Type - Grant Type - Grant Type - Grant Type - -	- - email - first name - address - last name - -	My Authority	Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, - tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. -	- -	- -
Client Name	http://redirecturl.domain	- - Grant Type - Grant Type - Grant Type - Grant Type - -	- - email - first name - address - last name - -	My Authority	Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, - tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. -	- -	- -