diff --git a/admin/css/admin.css b/admin/css/admin.css
index 77f47e637db..20cd1aa02c0 100644
--- a/admin/css/admin.css
+++ b/admin/css/admin.css
@@ -14,10 +14,10 @@
  */
 
 body {
-    margin: 0;
+    padding: 0;
 }
 
-#admin-header-container, #admin-content-container {
+#admin-header-container {
     padding: 0 30px;
 }
 
@@ -30,7 +30,7 @@ body {
 }
 
 #admin-header-container #admin-header-content {
-    background: url('/shared/oae/img/oae-logo.png') no-repeat left center transparent;
+    background: url('/shared/oae/img/oae-logo.png') no-repeat 15px center transparent;
     background-size: 60px;
     min-height: 70px;
 }
@@ -47,7 +47,7 @@ body {
     font-size: 22px;
     font-weight: normal;
     margin: 0;
-    padding: 15px 0 0 80px;
+    padding: 18px 0 0 80px;
 }
 
 
@@ -55,6 +55,10 @@ body {
  ** CONTENT **
  *************/
 
+#admin-content {
+    margin-bottom: 100px;
+}
+
 #admin-content-container {
     padding-top: 20px;
     padding-bottom: 120px;
@@ -68,6 +72,10 @@ body {
     margin-bottom: 20px;
 }
 
+.admin-container-striped form {
+    margin: 20px 0;
+}
+
 /* Tenant list */
 
 .table-striped td.admin-tenants-visit {
@@ -114,29 +122,32 @@ td.jeditable-container:hover {
     background: linear-gradient(to bottom, #DDD 0%,#CCC 100%) !important; /* W3C */
 }
 
+td.jeditable-container form input {
+    height: 25px !important;
+}
+
 td form {
     margin: 0;
 }
 
 /* Module configuration */
 
-.admin-module-configuration-container input[type="checkbox"],
-.admin-module-configuration-container .admin-module-configuration-toggle-button i {
-    float:left;
-    margin-right:12px;
+.admin-module-configuration-container {
+    margin: 0;
 }
 
-.admin-module-configuration-container .form-horizontal .control-label {
-    width: 225px;
+.admin-module-configuration-container form {
+    margin: 0 0 20px;
 }
 
-.admin-module-configuration-container .form-horizontal .controls {
-    margin-left: 250px;
+.admin-module-configuration-container .admin-module-configuration-toggle-button i {
+    float:left;
+    margin-right:12px;
 }
 
 .admin-module-configuration-container h4 {
     margin-top: 20px;
-    margin-bottom: 20px;
+    margin-bottom: 7px;
 }
 
 .admin-module-configuration-container h4 span,
@@ -145,16 +156,15 @@ td form {
     font-weight: normal;
 }
 
-
-.admin-container-striped form {
-    margin: 20px 0;
-}
 .admin-container-striped > div:nth-child(2n+1),
 .admin-container-striped > div:nth-child(2n+2) {
     border-top: 1px solid #DDD;
     max-width: none;
     padding: 12px;
 }
+.admin-container-striped form .form-group {
+    margin-left: 0;
+}
 
 /* Skinning configuration */
 
@@ -168,20 +178,26 @@ td form {
     margin-top: 20px;
 }
 
-#admin-skinning-container .control-group {
-    margin-bottom: 0px;
+#admin-skinning-container #admin-skinning-actions {
+    margin-top: 30px;
 }
 
-#admin-skinning-container .control-label {
-    width: 350px;
+#admin-skinning-form .form-group {
+    margin: 0;
 }
 
-#admin-skinning-container .controls {
-    margin-left: 370px;
+/* Override bootstrap box sizing for the spectrum plugin https://github.com/bgrins/spectrum/issues/175 */
+
+.sp-container *,
+.sp-container *:after,
+.sp-container *:before {
+    -webkit-box-sizing: content-box;
+       -moz-box-sizing: content-box;
+            box-sizing: content-box;
 }
 
-#admin-skinning-container #admin-skinning-actions {
-    margin-top: 30px;
+.sp-input-container .sp-input {
+    background-color: #FFF;
 }
 
 /************
@@ -198,13 +214,13 @@ td form {
 }
 
 #admin-footer-content {
-    background: url("/shared/oae/img/oae-logo-white.png") no-repeat scroll left 20px transparent;
+    background: url("/shared/oae/img/oae-logo-white.png") no-repeat scroll 15px center transparent;
     background-size: 70px;
-    min-height: 75px;
+    min-height: 80px;
 }
 
 #admin-footer-container ul {
-    margin: 30px 0 10px 50px;
+    margin: 30px 0 0 50px;
 }
 
 #admin-footer-container ul li {
diff --git a/admin/index.html b/admin/index.html
index f94fa8b3b60..1ac7228138f 100644
--- a/admin/index.html
+++ b/admin/index.html
@@ -3,6 +3,7 @@
     <head>
 
         <title>Open Academic Environment - Administration UI</title>
+        <meta name="viewport" content="width=device-width, user-scalable=no">
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
 
@@ -21,56 +22,49 @@
 
         <div id="admin-header-container"><!-- --></div>
 
-        <div id="admin-content-container">
-            <div class="row-fluid">
-                <div id="admin-lhnav-container" class="span2 hide"><!-- --></div>
-                <div id="admin-content" class="span10">
-                    <!-- Login -->
-                    <div id="admin-login-container" class="hide">
-                        <h2>Sign in to the OAE Administration Panel</h2>
-                        <div>
-                            <div id="admin-login" class="admin-login-container">
-                                <form id="admin-login-form" form method="POST" class="form-horizontal">
-                                    <div class="control-group">
-                                        <label for="admin-login-form-username" class="control-label">Username</label>
-                                        <div class="controls">
-                                            <input type="text" id="admin-login-form-username" name="username" class="required"/>
-                                        </div>
-                                    </div>
-                                    <div class="control-group">
-                                        <label for="admin-login-form-password" class="control-label">Password</label>
-                                        <div class="controls">
-                                            <input type="password" id="admin-login-form-password" name="password" class="required"/>
-                                        </div>
-                                    </div>
-                                    <div class="control-group">
-                                        <div class="controls">
-                                            <button type="submit" class="btn btn-primary">Sign in</button>
-                                        </div>
-                                    </div>
-                                </form>
-                            </div>
+        <main id="admin-content-container" role="main">
+            <div id="admin-lhnav-container" class="col-md-2 hide"><!-- --></div>
+            <div id="admin-content" class="col-md-10">
+                <!-- Login -->
+                <div id="admin-login-container" class="hide">
+                    <h2>Sign in to the OAE Administration Panel</h2>
+                    <div>
+                        <div id="admin-login" class="admin-login-container col-md-5">
+                            <form id="admin-login-form" form method="POST" class="form-horizontal" role="form">
+                                <div class="form-group">
+                                    <label for="admin-login-form-username" class="control-label">Username</label>
+                                    <input type="text" id="admin-login-form-username" name="username" class="form-control required"/>
+                                </div>
+                                <div class="form-group">
+                                    <label for="admin-login-form-password" class="control-label">Password</label>
+                                    <input type="password" id="admin-login-form-password" name="password" class="form-control required"/>
+                                </div>
+                                <div class="form-group">
+                                    <button type="submit" class="btn btn-primary">Sign in</button>
+                                </div>
+                            </form>
                         </div>
                     </div>
+                </div>
 
-                    <div id="admin-views">
-                        <div id="admin-tenants-container" class="hide"><!-- --></div>
-                        <div id="admin-modules-container" class="hide"><!-- --></div>
-                        <div id="admin-skinning-container" class="hide"><!-- --></div>
-                    </div>
-
-                    <div id="admin-error-container"><!-- --></div>
-                    <div id="admin-warning-container"><!-- --></div>
-                    <div id="admin-success-container"><!-- --></div>
-                    <div id="admin-confirmation-container"><!-- --></div>
+                <div id="admin-views">
+                    <div id="admin-tenants-container" class="hide col-sm-12"><!-- --></div>
+                    <div id="admin-modules-container" class="hide col-sm-12"><!-- --></div>
+                    <div id="admin-skinning-container" class="hide col-sm-12"><!-- --></div>
                 </div>
+
+                <div id="admin-error-container"><!-- --></div>
+                <div id="admin-warning-container"><!-- --></div>
+                <div id="admin-success-container"><!-- --></div>
+                <div id="admin-confirmation-container"><!-- --></div>
             </div>
-        </div>
+        </main>
+
         <div id="admin-footer-container"><!-- --></div>
 
         <div id="admin-header-template"><!--
-            <div class="row-fluid">
-                <div class="span12" id="admin-header-content">
+            <div class="row">
+                <div class="col-md-12" id="admin-header-content">
                     {if !oae.data.me.anon}
                         <div id="admin-header-user" class="pull-right">
                             <button type="button" class="btn btn-inverse" id="admin-header-user-logout">Log out</button>
@@ -113,23 +107,21 @@ <h1>${context.displayName|encodeForHTML}</h1>
         --></div>
 
         <div id="admin-footer-template"><!--
-            <div class="row-fluid">
-                <div class="span12" id="admin-footer-content">
-                    {if !oae.data.me.anon && (context.isGlobalAdminServer || context.isTenantOnGlobalAdminServer)}
-                        <ul class="inline">
-                            <li>
-                                <a href="/">Global administration</a>
-                            </li>
-                            {for tenant in tenants}
-                                {if tenant.alias}
-                                    <li>
-                                        <a href="/tenant/${tenant.alias|encodeForURL}">${tenant.displayName|encodeForHTML}</a>
-                                    </li>
-                                {/if}
-                            {/for}
-                        </ul>
-                    {/if}
-                </div>
+            <div class="row col-md-12" id="admin-footer-content">
+                {if !oae.data.me.anon && (context.isGlobalAdminServer || context.isTenantOnGlobalAdminServer)}
+                    <ul class="list-inline">
+                        <li>
+                            <a href="/">Global administration</a>
+                        </li>
+                        {for tenant in tenants}
+                            {if tenant.alias}
+                                <li>
+                                    <a href="/tenant/${tenant.alias|encodeForURL}">${tenant.displayName|encodeForHTML}</a>
+                                </li>
+                            {/if}
+                        {/for}
+                    </ul>
+                {/if}
             </div>
         --></div>
 
@@ -222,30 +214,28 @@ <h2>Tenants</h2>
                             <i class="icon-plus pull-left" style="margin-right:12px;"></i>
                             Create a new tenant
                         </button>
-                        <div class="createtenant-container" style="display: none;">
-                            <form method="POST" id="createtenant-form" class="form-horizontal">
-                                <div class="control-group">
-                                    <label for="createtenant-alias" class="control-label">Alias:</label>
-                                    <div class="controls">
-                                        <input type="text" name="alias" id="createtenant-alias" placeholder="Alias" class="required nospaces"/>
+                        <div class="createtenant-container clearfix hide">
+                            <form method="POST" id="createtenant-form" class="form-horizontal col-sm-7" role="form">
+                                <div class="form-group">
+                                    <label for="createtenant-alias" class="col-sm-3 control-label">Alias:</label>
+                                    <div class="col-sm-9">
+                                        <input type="text" name="alias" id="createtenant-alias" placeholder="Alias" class="form-control required nospaces"/>
                                     </div>
                                 </div>
-                                <div class="control-group">
-                                    <label for="createtenant-displayName" class="control-label">Name:</label>
-                                    <div class="controls">
-                                        <input type="text" name="displayName" id="createtenant-displayName" placeholder="Name" class="required"/>
+                                <div class="form-group">
+                                    <label for="createtenant-displayName" class="col-sm-3 control-label">Name:</label>
+                                    <div class="col-sm-9">
+                                        <input type="text" name="displayName" id="createtenant-displayName" placeholder="Name" class="form-control required"/>
                                     </div>
                                 </div>
-                                <div class="control-group">
-                                    <label for="createtenant-host" class="control-label">Host:</label>
-                                    <div class="controls">
-                                        <input type="text" name="host" id="createtenant-host" placeholder="Host" class="required url"/>
+                                <div class="form-group">
+                                    <label for="createtenant-host" class="col-sm-3 control-label">Host:</label>
+                                    <div class="col-sm-9">
+                                        <input type="text" name="host" id="createtenant-host" placeholder="Host" class="form-control required url"/>
                                     </div>
                                 </div>
-                                <div class="control-group">
-                                    <div class="controls">
-                                        <button type="submit" id="createtenant-submit-button" class="btn btn-primary">Create new tenant</button>
-                                    </div>
+                                <div class="form-group">
+                                    <button type="submit" id="createtenant-submit-button" class="btn btn-primary">Create new tenant</button>
                                 </div>
                             </form>
                         </div>
@@ -255,15 +245,16 @@ <h2>Tenants</h2>
         --></div>
 
         <div id="admin-modules-template"><!--
+            <h2>Modules</h2>
             <div class="admin-container-striped">
                 {for item in schema}
-                    <div class="admin-module-configuration-container">
-                        <button type="button" title="Edit the ${item.module.title|encodeForHTMLAttribute}" class="admin-module-configuration-toggle-button btn">
+                    <div class="row admin-module-configuration-container">
+                        <button type="button" title="Edit the ${item.title|encodeForHTMLAttribute}" class="admin-module-configuration-toggle-button btn">
                             <i class="icon-pencil"></i>
                             ${item.module.title|encodeForHTML}
                         </button>
                         <div class="admin-module-configuration-container" style="display:none;">
-                            <form class="form-horizontal admin-module-configuration-form" data-module="${item.moduleName}">
+                            <form class="form-horizontal admin-module-configuration-form col-md-12" data-module="${item.moduleName}" role="form">
                                 {for option in item.module}
                                     {if option && option_index !== "title"}
                                         <h4>${option.name|encodeForHTML}</h4>
@@ -272,23 +263,26 @@ <h4>${option.name|encodeForHTML}</h4>
                                             {var configPath = item.moduleName + '/' + option_index + '/' + element_index}
                                             {var configValue = configuration[item.moduleName][option_index][element_index]}
                                             {if element.type === "boolean"}
-                                                <div class="control-group">
-                                                    <input type="checkbox" id="${configPath|encodeForHTMLAttribute}" name="${configPath|encodeForHTMLAttribute}" {if configValue}checked="checked"{/if} class="admin-module-config-checkbox" {if !tenantCanOverride} disabled="disabled"{/if}/>
-                                                    <label for="${configPath|encodeForHTMLAttribute}">${element.description|encodeForHTML} {if !tenantCanOverride} <span class="text-warning">(Tenant override disabled)</span>{/if}</label>
+                                                <div class="form-group">
+                                                    <div class="checkbox">
+                                                        <label for="${configPath|encodeForHTMLAttribute}">
+                                                            <input type="checkbox" id="${configPath|encodeForHTMLAttribute}" name="${configPath|encodeForHTMLAttribute}" {if configValue}checked="checked"{/if} class="admin-module-config-checkbox" {if !tenantCanOverride} disabled="disabled"{/if}/>${element.description|encodeForHTML} {if !tenantCanOverride} <span class="text-warning">(Tenant override disabled)</span>{/if}
+                                                        </label>
+                                                    </div>
                                                 </div>
                                             {elseif element.type === "text"}
-                                                <div class="control-group">
-                                                    <label for="${configPath|encodeForHTMLAttribute}" class="control-label">${element.description|encodeForHTML} {if !tenantCanOverride} <span class="text-warning">(Tenant override disabled)</span>{/if}</label>
-                                                    <div class="controls">
-                                                        <input type="text" id="${configPath|encodeForHTMLAttribute}" name="${configPath|encodeForHTMLAttribute}" value="${configValue.toString()|encodeForHTMLAttribute}" {if !tenantCanOverride} disabled="disabled"{/if}/>
+                                                <div class="form-group">
+                                                    <label for="${configPath|encodeForHTMLAttribute}" class="control-label col-xs-12 col-sm-3 col-md-3">${element.description|encodeForHTML} {if !tenantCanOverride} <span class="text-warning">(Tenant override disabled)</span>{/if}</label>
+                                                    <div class="col-xs-12 col-sm-9 col-md-9">
+                                                        <input type="text" id="${configPath|encodeForHTMLAttribute}" name="${configPath|encodeForHTMLAttribute}" value="${configValue.toString()|encodeForHTMLAttribute}" {if !tenantCanOverride} disabled="disabled"{/if} class="form-control"/>
                                                     </div>
                                                 </div>
                                             {elseif element.type === "internationalizableText"}
                                                 <div class="admin-internationalizable-text-container">
-                                                    <div class="control-group">
-                                                        <label for="${configPath|encodeForHTMLAttribute}" class="control-label">Choose terms and conditions language to change</label>
-                                                        <div class="controls">
-                                                            <select class="admin-internationalizabletext-language-picker" id="${configPath|encodeForHTMLAttribute}">
+                                                    <div class="form-group">
+                                                        <label for="${configPath|encodeForHTMLAttribute}" class="control-label col-xs-12 col-sm-3 col-md-3">Choose language to change</label>
+                                                        <div class="col-xs-12 col-sm-9 col-md-9">
+                                                            <select class="admin-internationalizabletext-language-picker form-control" id="${configPath|encodeForHTMLAttribute}">
                                                                 <option value="default">Default</option>
                                                                 {for language in languages}
                                                                     <option value="${language.value|encodeForHTMLAttribute}">${language.name|encodeForHTML}</option>
@@ -298,37 +292,39 @@ <h4>${option.name|encodeForHTML}</h4>
                                                     </div>
 
                                                     {var defaultLanguageValue = configValue.default ? configValue.default.toString() : element.defaultValue.default}
-                                                    <div data-id="default" class="control-group">
-                                                        <label for="${configPath|encodeForHTMLAttribute}/default" class="control-label">default - ${element.description|encodeForHTML} {if !tenantCanOverride} <span class="text-warning">(Tenant override disabled)</span>{/if}</label>
-                                                        <div class="controls">
-                                                            <textarea type="text" id="${configPath|encodeForHTMLAttribute}/default" name="${configPath|encodeForHTMLAttribute}/default" {if !tenantCanOverride} disabled="disabled"{/if}>${defaultLanguageValue|encodeForHTML}</textarea>
+                                                    <div data-id="default" class="form-group">
+                                                        <label for="${configPath|encodeForHTMLAttribute}/default" class="control-label col-xs-12 col-sm-3 col-md-3">default - ${element.description|encodeForHTML} {if !tenantCanOverride} <span class="text-warning">(Tenant override disabled)</span>{/if}</label>
+                                                        <div class="col-xs-12 col-sm-9 col-md-9">
+                                                            <textarea type="text" id="${configPath|encodeForHTMLAttribute}/default" class="form-control" name="${configPath|encodeForHTMLAttribute}/default" {if !tenantCanOverride} disabled="disabled"{/if}>${defaultLanguageValue|encodeForHTML}</textarea>
                                                         </div>
                                                     </div>
 
                                                     {for language in languages}
                                                         {var i18nValue = configValue[language.value] ? configValue[language.value].toString() : ''}
-                                                        <div data-id="${language.value}" class="control-group hide">
-                                                            <label for="${configPath|encodeForHTMLAttribute}/${language.value}" class="control-label">${language.name} - ${element.description|encodeForHTML} {if !tenantCanOverride} <span class="text-warning">(Tenant override disabled)</span>{/if}</label>
-                                                            <div class="controls">
-                                                                <textarea type="text" id="${configPath|encodeForHTMLAttribute}/${language.value}" name="${configPath|encodeForHTMLAttribute}/${language.value}" {if !tenantCanOverride} disabled="disabled"{/if}>${i18nValue|encodeForHTML}</textarea>
+                                                        <div data-id="${language.value}" class="form-group hide">
+                                                            <label for="${configPath|encodeForHTMLAttribute}/${language.value}" class="control-label col-xs-12 col-sm-3 col-md-3">${language.name} - ${element.description|encodeForHTML} {if !tenantCanOverride} <span class="text-warning">(Tenant override disabled)</span>{/if}</label>
+                                                            <div class="col-xs-12 col-sm-9 col-md-9">
+                                                                <textarea type="text" id="${configPath|encodeForHTMLAttribute}/${language.value}" class="form-control" name="${configPath|encodeForHTMLAttribute}/${language.value}" {if !tenantCanOverride} disabled="disabled"{/if}>${i18nValue|encodeForHTML}</textarea>
                                                             </div>
                                                         </div>
                                                     {/for}
                                                 </div>
                                             {elseif element.type === "radio"}
-                                                <div class="control-group">
+                                                <div class="form-group">
                                                     {for rbt in element.group}
-                                                        <label class="radio">
-                                                            <input type="radio" id="${configPath|encodeForHTMLAttribute}" name="${configPath|encodeForHTMLAttribute}" value="${rbt.value|encodeForHTMLAttribute}" {if configValue === rbt.value} checked="checked"{/if} {if !tenantCanOverride} disabled="disabled"{/if}>
-                                                            ${rbt.name|encodeForHTML} {if !tenantCanOverride} <span class="text-warning">(Tenant override disabled)</span>{/if}
-                                                        </label>
+                                                        <div class="radio">
+                                                            <label>
+                                                                <input type="radio" id="${configPath|encodeForHTMLAttribute}" name="${configPath|encodeForHTMLAttribute}" value="${rbt.value|encodeForHTMLAttribute}" {if configValue === rbt.value} checked="checked"{/if} {if !tenantCanOverride} disabled="disabled"{/if}>
+                                                                ${rbt.name|encodeForHTML} {if !tenantCanOverride} <span class="text-warning">(Tenant override disabled)</span>{/if}
+                                                            </label>
+                                                        </div>
                                                     {/for}
                                                 </div>
                                             {elseif element.type === "list"}
-                                                <div class="control-group">
-                                                    <label for="${configPath|encodeForHTMLAttribute}" class="control-label">${element.description|encodeForHTML} {if !tenantCanOverride} <span class="text-warning">(Tenant override disabled)</span>{/if}</label>
-                                                    <div class="controls">
-                                                        <select id="${configPath|encodeForHTMLAttribute}" name="${configPath|encodeForHTMLAttribute}" {if !tenantCanOverride} disabled="disabled"{/if}>
+                                                <div class="form-group">
+                                                    <label for="${configPath|encodeForHTMLAttribute}" class="control-label col-xs-12 col-sm-3 col-md-3">${element.description|encodeForHTML} {if !tenantCanOverride} <span class="text-warning">(Tenant override disabled)</span>{/if}</label>
+                                                    <div class="col-xs-12 col-sm-9 col-md-9">
+                                                        <select id="${configPath|encodeForHTMLAttribute}" name="${configPath|encodeForHTMLAttribute}" {if !tenantCanOverride} disabled="disabled"{/if} class="form-control">
                                                             {for opt in element.list}
                                                                 <option value="${opt.value|encodeForHTMLAttribute}" {if configValue === opt.value} selected="selected"{/if}>${opt.name|encodeForHTML}</option>
                                                             {/for}
@@ -360,10 +356,12 @@ <h4>${subsection.name|encodeForHTML}</h4>
                         {/if}
                         <div class="admin-container-striped">
                             {for variable in subsection.variables}
-                                <div class="control-group">
-                                    <label class="control-label" for="admin-skinning-${variable.name|encodeForHTMLAttribute}">${variable.description|encodeForHTML}</label>
-                                    <div class="controls">
-                                        <input type="text" id="admin-skinning-${variable.name|encodeForHTMLAttribute}" name="${variable.name|encodeForHTMLAttribute}" class="input-xlarge" value="${variable.value|encodeForHTMLAttribute}" data-type="${variable.type|encodeForHTMLAttribute}" />
+                                <div class="form-group">
+                                    <label class="control-label col-xs-12 col-sm-4 col-md-4" for="admin-skinning-${variable.name|encodeForHTMLAttribute}">${variable.description|encodeForHTML}</label>
+                                    <div class="col-xs-11 col-sm-7 col-md-7">
+                                        <input type="text" id="admin-skinning-${variable.name|encodeForHTMLAttribute}" name="${variable.name|encodeForHTMLAttribute}" class="form-control input-xlarge" value="${variable.value|encodeForHTMLAttribute}" data-type="${variable.type|encodeForHTMLAttribute}" />
+                                    </div>
+                                    <div class="col-xs-1">
                                         <button type="button" class="btn btn-link pull-right admin-skinning-revert" title="Revert to original value">
                                             <i class="icon-undo"><span class="oae-aural-text">Revert to original value</span></i>
                                         </button>
@@ -383,22 +381,27 @@ <h4>${subsection.name|encodeForHTML}</h4>
 
         <div id="admin-confirmation-template"><!--
             <div class="modal" id="${modal.id|encodeForHTMLAttribute}" tabindex="-1" role="dialog" aria-labelledby="${modal.id|encodeForHTMLAttribute}-label" aria-hidden="true">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                    <h3 id="${modal.id|encodeForHTMLAttribute}-label">${modal.title|encodeForHTML}</h3>
-                </div>
-                <div class="modal-body">
-                    <p>${modal.message|encodeForHTML}</p>
-                </div>
-                <div class="modal-footer">
-                    {if modal.cancel}
-                        <button class="btn" data-dismiss="modal" aria-hidden="true">${modal.cancel|encodeForHTML}</button>
-                    {/if}
-                    <button class="btn {if modal.confirmclass} ${modal.confirmclass|encodeForHTMLAttribute}{else} btn-primary{/if}" id="${modal.id|encodeForHTMLAttribute}-confirm"
-                        {for attr in modal.confirmdata}
-                            data-${attr_index}="${attr|encodeForHTMLAttribute}"
-                        {/for}
-                        >${modal.confirm|encodeForHTML}</button>
+                <div class="modal-dialog">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                            <h3 id="${modal.id|encodeForHTMLAttribute}-label">${modal.title|encodeForHTML}</h3>
+                        </div>
+                        <div class="modal-body">
+                            <p>${modal.message|encodeForHTML}</p>
+                        </div>
+                        <div class="modal-footer">
+                            {if modal.cancel}
+                                <button class="btn" data-dismiss="modal" aria-hidden="true">${modal.cancel|encodeForHTML}</button>
+                            {/if}
+                            <button class="btn {if modal.confirmclass} ${modal.confirmclass|encodeForHTMLAttribute}{else} btn-primary{/if}" id="${modal.id|encodeForHTMLAttribute}-confirm"
+                                {for attr in modal.confirmdata}
+                                    data-${attr_index}="${attr|encodeForHTMLAttribute}"
+                                {/for}
+                                >${modal.confirm|encodeForHTML}
+                            </button>
+                        </div>
+                    </div>
                 </div>
             </div>
         --></div>
diff --git a/admin/js/admin.skin.js b/admin/js/admin.skin.js
index 1eb6b521c53..772d5429c10 100644
--- a/admin/js/admin.skin.js
+++ b/admin/js/admin.skin.js
@@ -261,7 +261,7 @@ define(['exports', 'jquery', 'underscore', 'oae.core', 'jquery.spectrum'], funct
      * value back to its previous value.
      */
     var revertSkinValue = function() {
-        var $input = $('input', $(this).parent());
+        var $input = $('input', $(this).parents('.form-group'));
         var defaultValue = defaultSkin[$input.attr('name')];
         // If the variable is a color, we use the set method provided by jQuery spectrum
         if ($input.attr('data-type') === 'color') {
diff --git a/admin/js/admin.util.js b/admin/js/admin.util.js
index 30285902f44..738f234e13d 100644
--- a/admin/js/admin.util.js
+++ b/admin/js/admin.util.js
@@ -28,10 +28,10 @@ define(['exports', 'jquery', 'oae.core'], function(exports, $, oae) {
     var toggleInternationalizableFieldContainer = exports.toggleInternationalizableFieldContainer = function() {
         // Define the target container
         var $targetContainer = $(this).parents('.admin-internationalizable-text-container');
-        // Hide all control groups except the first one (language select) in the target container
-        $targetContainer.find('.control-group').hide();
-        $targetContainer.find('.control-group:first-child').show();
-        // Show the selected language control group in the target container
+        // Hide all form groups except the first one (language select) in the target container
+        $targetContainer.find('.form-group').hide();
+        $targetContainer.find('.form-group:first-child').show();
+        // Show the selected language form group in the target container
         $targetContainer.find('div[data-id="' + $(this).val() + '"]').show();
     };
 
diff --git a/docs/css/doc.css b/docs/css/doc.css
index e5a7b3b0861..b6a3587b01a 100644
--- a/docs/css/doc.css
+++ b/docs/css/doc.css
@@ -15,6 +15,7 @@
 
 html, body {
     margin: 0;
+    padding: 0;
 }
 #doc-header-container, #doc-content-container {
     padding: 0 30px;
@@ -105,9 +106,15 @@ td form {
     display: block;
     margin: 0 0 -1px;
     padding: 8px 14px;
+    word-break: break-word;
+}
+.bs-docs-sidenav > li > a > span {
+    display: block;
+    margin-right: 22px;
 }
 .bs-docs-sidenav .icon-chevron-right {
     margin-right: -6px;
+    margin-top: -5px;
     opacity: 0.25;
 }
 .nav > li > a:hover {
diff --git a/docs/index.html b/docs/index.html
index beac9067451..f6808a9187e 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
     <head>
+        <meta name="viewport" content="width=device-width, user-scalable=no">
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
         <noscript>
@@ -10,7 +11,7 @@
         <!-- CORE CSS -->
         <link rel="stylesheet" type="text/css" href="/shared/oae/css/oae.core.css" />
         <link rel="stylesheet" type="text/css" href="/api/ui/skin" />
-        
+
         <!-- PAGE CSS -->
         <link href="/docs/css/doc.css" type="text/css" rel="stylesheet"/>
     </head>
@@ -22,12 +23,12 @@ <h1>API Reference</h1>
             </div>
         </div>
         <!-- CONTENT -->
-        <div id="doc-content-container">
-            <div class="row-fluid">
-                <div id="doc-modules-container" class="span3"><!----></div>
-                <div id="doc-module-container" class="span9"><!----></div>
+        <main id="doc-content-container" role="main">
+            <div class="row">
+                <div id="doc-modules-container" class="col-sm-3"><!----></div>
+                <div id="doc-module-container" class="col-sm-9"><!----></div>
             </div>
-        </div>
+        </main>
 
         <div id="doc-modules-template"><!--
             {macro renderModules(title, type, modules)}
@@ -35,7 +36,7 @@ <h5>${title}</h5>
                 <ul class="nav nav-list bs-docs-sidenav">
                     {for module in modules}
                         <li data-id="${module}" data-type="${type}">
-                            <a href="/docs/${type}/${module}"><i class="icon-chevron-right pull-right"></i> ${module}</a>
+                            <a href="/docs/${type}/${module}"><i class="icon-chevron-right pull-right"></i> <span>${module}</span></a>
                         </li>
                     {/for}
                 </ul>
diff --git a/node_modules/oae-core/accountpreferences/accountpreferences.html b/node_modules/oae-core/accountpreferences/accountpreferences.html
index dfac4ea1538..1229b741d87 100644
--- a/node_modules/oae-core/accountpreferences/accountpreferences.html
+++ b/node_modules/oae-core/accountpreferences/accountpreferences.html
@@ -2,75 +2,79 @@
 <link rel="stylesheet" type="text/css" href="css/accountpreferences.css" />
 
 <!-- MODAL -->
-<div id="accountpreferences-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="accountpreferences-modal-title" aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
-        <h3 id="accountpreferences-modal-title">__MSG__MY_ACCOUNT__</h3>
-    </div>
-    <div id="accountpreferences-tab-container" class="modal-body">
-        <ul class="nav nav-tabs">
-            <li class="active">
-                <a href="#accountpreferences-preferences" data-toggle="tab">__MSG__PREFERENCES__</a>
-            </li>
-            <li>
-                <a href="#accountpreferences-password" data-toggle="tab">__MSG__PASSWORD__</a>
-            </li>
-        </ul>
-    </div>
-
-    <div class="tab-content">
-        <form id="accountpreferences-preferences" class="tab-pane active form-horizontal">
-            <div class="modal-body">
-                <div class="well">
-                    <div class="control-group">
-                        <label class="control-label" for="accountpreferences-timezone">__MSG__TIME_ZONE_COLON__</label>
-                        <div class="controls">
-                            <select id="accountpreferences-timezone" name="accountpreferences-timezone"><!-- --></select>
-                        </div>
-                    </div>
-                    <div class="control-group">
-                        <label class="control-label" for="accountpreferences-language">__MSG__LANGUAGE_COLON__</label>
-                        <div class="controls">
-                            <select id="accountpreferences-language" name="accountpreferences-language"><!-- --></select>
-                        </div>
-                    </div>
-                </div>
+<div id="accountpreferences-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="accountpreferences-modal-title" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
+                <h3 id="accountpreferences-modal-title">__MSG__MY_ACCOUNT__</h3>
             </div>
-            <div class="modal-footer">
-                <button class="btn btn-link pull-left" data-dismiss="modal" type="button">__MSG__CANCEL__</button>
-                <button class="btn btn-primary pull-right" type="submit">__MSG__SAVE__</button>
+            <div id="accountpreferences-tab-container" class="modal-body">
+                <ul class="nav nav-tabs">
+                    <li class="active">
+                        <a href="#accountpreferences-preferences" data-toggle="tab">__MSG__PREFERENCES__</a>
+                    </li>
+                    <li>
+                        <a href="#accountpreferences-password" data-toggle="tab">__MSG__PASSWORD__</a>
+                    </li>
+                </ul>
             </div>
-        </form>
 
-
-        <form id="accountpreferences-password" class="tab-pane form-horizontal">
-            <div class="modal-body">
-                <div class="well">
-                    <div class="control-group">
-                        <label class="control-label" for="accountpreferences-current-password">__MSG__CURRENT_PASSWORD_COLON__</label>
-                        <div class="controls">
-                            <input type="password" id="accountpreferences-current-password" name="accountpreferences-current-password" placeholder="&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;" class="input-block-level required maxlength-short">
+            <div class="tab-content">
+                <form id="accountpreferences-preferences" class="tab-pane active form-horizontal" role="form">
+                    <div class="modal-body">
+                        <div class="well">
+                            <div class="form-group">
+                                <label class="control-label col-lg-4" for="accountpreferences-timezone">__MSG__TIME_ZONE_COLON__</label>
+                                <div class="col-lg-8">
+                                    <select id="accountpreferences-timezone" class="form-control" name="accountpreferences-timezone"><!-- --></select>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="control-label col-lg-4" for="accountpreferences-language">__MSG__LANGUAGE_COLON__</label>
+                                <div class="col-lg-8">
+                                    <select id="accountpreferences-language" class="form-control" name="accountpreferences-language"><!-- --></select>
+                                </div>
+                            </div>
                         </div>
                     </div>
-                    <div class="control-group">
-                        <label class="control-label" for="accountpreferences-new-password">__MSG__NEW_PASSWORD_COLON__</label>
-                        <div class="controls">
-                            <input type="password" id="accountpreferences-new-password" name="accountpreferences-new-password" placeholder="&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;" class="input-block-level required maxlength-short">
-                        </div>
+
+                    <div class="modal-footer">
+                        <button class="btn btn-link pull-left" data-dismiss="modal" type="button">__MSG__CANCEL__</button>
+                        <button class="btn btn-primary pull-right" type="submit">__MSG__SAVE__</button>
                     </div>
-                    <div class="control-group">
-                        <label class="control-label" for="accountpreferences-retype-password">__MSG__RETYPE_NEW_PASSWORD_COLON__</label>
-                        <div class="controls">
-                            <input type="password" id="accountpreferences-retype-password" name="accountpreferences-retype-password" placeholder="&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;" class="input-block-level required maxlength-short">
+                </form>
+
+                <form id="accountpreferences-password" class="tab-pane form-horizontal" role="form">
+                    <div class="modal-body">
+                        <div class="well">
+                            <div class="form-group">
+                                <label class="control-label col-lg-5" for="accountpreferences-current-password">__MSG__CURRENT_PASSWORD_COLON__</label>
+                                <div class="col-lg-7">
+                                    <input type="password" id="accountpreferences-current-password" name="accountpreferences-current-password" placeholder="&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;" class="form-control required maxlength-short">
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="control-label col-lg-5" for="accountpreferences-new-password">__MSG__NEW_PASSWORD_COLON__</label>
+                                <div class="col-lg-7">
+                                    <input type="password" id="accountpreferences-new-password" name="accountpreferences-new-password" placeholder="&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;" class="form-control required maxlength-short">
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="control-label col-lg-5" for="accountpreferences-retype-password">__MSG__RETYPE_NEW_PASSWORD_COLON__</label>
+                                <div class="col-lg-7">
+                                    <input type="password" id="accountpreferences-retype-password" name="accountpreferences-retype-password" placeholder="&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;" class="form-control required maxlength-short">
+                                </div>
+                            </div>
                         </div>
                     </div>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <button class="btn btn-link pull-left" data-dismiss="modal" type="button">__MSG__CANCEL__</button>
-                <button class="btn btn-primary pull-right" type="submit">__MSG__SAVE__</button>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
+                        <button type="submit" class="btn btn-primary pull-right">__MSG__SAVE__</button>
+                    </div>
+                </form>
             </div>
-        </form>
+        </div>
     </div>
 </div>
 
diff --git a/node_modules/oae-core/accountpreferences/js/accountpreferences.js b/node_modules/oae-core/accountpreferences/js/accountpreferences.js
index 2b33dedc2e3..dd2a7e75c11 100644
--- a/node_modules/oae-core/accountpreferences/js/accountpreferences.js
+++ b/node_modules/oae-core/accountpreferences/js/accountpreferences.js
@@ -249,7 +249,7 @@ define(['jquery', 'oae.core'], function($, oae) {
                 setUpValidation();
             });
 
-            $('#accountpreferences-modal', $rootel).on('hidden', reset);
+            $('#accountpreferences-modal', $rootel).on('hidden.bs.modal', reset);
         };
 
         setUpAccountPreferencesModal();
diff --git a/node_modules/oae-core/activity/activity.html b/node_modules/oae-core/activity/activity.html
index b8357dfeed2..db622006729 100644
--- a/node_modules/oae-core/activity/activity.html
+++ b/node_modules/oae-core/activity/activity.html
@@ -30,7 +30,7 @@ <h2>__MSG__RECENT_ACTIVITY__</h2>
             <div class="pull-left activity-entity-thumbnail">
                 ${renderThumbnail(actor1Obj)}
             </div>
-            <div class="activity-summary oae-threedots">
+            <div class="activity-summary">
                 ${renderActivitySummary(activity)}
             </div>
             <small class="muted">${oae.api.l10n.timeAgo(activity.published)}</small>
@@ -61,7 +61,7 @@ <h2>__MSG__RECENT_ACTIVITY__</h2>
             {/if}
 
             {if previewObj['oae:wideImage']}
-                <ul class="oae-list oae-list-grid activity-wide">
+                <ul class="row oae-list oae-list-grid activity-wide">
                     ${listItem(previewObj, null, false, previewObj['oae:wideImage'].url)}
                 </ul>
             {else}
@@ -77,7 +77,7 @@ <h2>__MSG__RECENT_ACTIVITY__</h2>
                     {var largePreviews = [previewObj]}
                 {/if}
 
-                <ul class="oae-list oae-list-grid">
+                <ul class="row oae-list oae-list-grid">
                     {for largePreview in largePreviews}
                         ${listItem(largePreview, null, false)}
                     {/for}
diff --git a/node_modules/oae-core/activity/css/activity.css b/node_modules/oae-core/activity/css/activity.css
index b5fd5243728..ff621ad703c 100644
--- a/node_modules/oae-core/activity/css/activity.css
+++ b/node_modules/oae-core/activity/css/activity.css
@@ -19,6 +19,10 @@
     width: 35px;
 }
 
+.activity-widget .activity-summary a {
+    word-break: break-all;
+}
+
 .activity-widget small {
     font-size: 12px;
 }
@@ -31,20 +35,15 @@
     margin-bottom: 10px;
 }
 
-.activity-widget ul.oae-list.oae-list-grid > li {
-    margin-right: 25px;
-    margin-bottom: 0;
-}
-
 /* Tile with multiple items */
 
 .activity-widget ul.oae-list.oae-list-grid > li .activity-multiple {
     height: 162px;
-    width: 162px;
     border: none;
     -webkit-box-shadow: none;
        -moz-box-shadow: none;
             box-shadow: none;
+    width: 162px;
 }
 
 .activity-widget ul.oae-list.oae-list-grid > li .activity-multiple div.oae-thumbnail {
@@ -53,11 +52,23 @@
     width: 25px;
 }
 
+.activity-widget ul.oae-list.oae-list-grid > li .activity-multiple div.oae-thumbnail img {
+    height: 25px;
+    min-width: 25px;
+    width: 25px;
+}
+
 /* Wide tiles */
 
+.activity-widget ul.oae-list.oae-list-grid.activity-wide > li {
+    max-width: 1000px;
+    padding: 0 15px;
+    width: 100%;
+}
+
 .activity-widget ul.oae-list.oae-list-grid.activity-wide > li div.oae-thumbnail {
-    width: 535px;
     height: 250px;
+    width: 100%;
 }
 
 .activity-widget ul.oae-list.oae-list-grid.activity-wide > li div.oae-thumbnail:before {
@@ -73,3 +84,7 @@
 .activity-widget .activity-comment-container li.media.activity-level-2 {
     margin-left: 110px;
 }
+
+.activity-widget .activity-comment-container li.media .media-body {
+    word-wrap: break-word;
+}
diff --git a/node_modules/oae-core/changepic/changepic.html b/node_modules/oae-core/changepic/changepic.html
index 0d0f81a94b3..9a0070b8414 100644
--- a/node_modules/oae-core/changepic/changepic.html
+++ b/node_modules/oae-core/changepic/changepic.html
@@ -3,41 +3,45 @@
 <link rel="stylesheet" type="text/css" href="/shared/vendor/js/jquery-plugins/jcrop/jquery.Jcrop.css" />
 
 <!-- MODAL -->
-<div id="changepic-modal" class="changepic-initial-view modal hide fade" tabindex="-1" role="dialog" aria-labelledby="changepic-modal-title" aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
-        <h3 id="changepic-modal-title">__MSG__PROFILE_PICTURE__</h3>
-    </div>
-    <form id="changepic-form">
-        <div class="modal-body">
-            <!-- HANDLING OF PICTURE UPLOAD -->
-            <div id="changepic-pic-container" class="text-center"><!-- --></div>
-
-            <!-- PICTURE IS BEING UPLOADED -->
-            <div id="changepic-uploading-container" class="hide text-center">
-                <div class="progress hide">
-                    <div class="bar"></div>
-                </div>
-                <i class="icon-spinner icon-spin">
-                    <span class="oae-aural-text">__MSG__UPLOADING__</span>
-                </i>
+<div id="changepic-modal" class="changepic-initial-view modal fade" tabindex="-1" role="dialog" aria-labelledby="changepic-modal-title" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
+                <h3 id="changepic-modal-title">__MSG__PROFILE_PICTURE__</h3>
             </div>
+            <form id="changepic-form" role="form">
+                <div class="modal-body">
+                    <!-- HANDLING OF PICTURE UPLOAD -->
+                    <div id="changepic-pic-container" class="text-center"><!-- --></div>
 
-            <!-- PICTURE IS SHOWN AFTER UPLOAD READY FOR CROPPING -->
-            <div id="changepic-jcrop-container" class="hide"><!-- --></div>
+                    <!-- PICTURE IS BEING UPLOADED -->
+                    <div id="changepic-uploading-container" class="hide text-center">
+                        <div class="progress hide">
+                            <div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
+                        </div>
+                        <i class="icon-spinner icon-spin">
+                            <span class="oae-aural-text">__MSG__UPLOADING__</span>
+                        </i>
+                    </div>
 
-            <!-- CROPPING IS IN PROGRESS -->
-            <div id="changepic-cropping-container" class="hide text-center">
-                <i class="icon-spinner icon-spin">
-                    <span class="oae-aural-text">__MSG__CROPPING__</span>
-                </i>
-            </div>
-        </div>
-        <div class="modal-footer hide">
-            <button class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
-            <button type="button" id="changepic-set" class="btn btn-primary pull-right">__MSG__SET_PICTURE__</button>
+                    <!-- PICTURE IS SHOWN AFTER UPLOAD READY FOR CROPPING -->
+                    <div id="changepic-jcrop-container" class="hide"><!-- --></div>
+
+                    <!-- CROPPING IS IN PROGRESS -->
+                    <div id="changepic-cropping-container" class="hide text-center">
+                        <i class="icon-spinner icon-spin">
+                            <span class="oae-aural-text">__MSG__CROPPING__</span>
+                        </i>
+                    </div>
+                </div>
+                <div class="modal-footer hide">
+                    <button type="button" class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
+                    <button type="submit" id="changepic-set" class="btn btn-primary pull-right">__MSG__SET_PICTURE__</button>
+                </div>
+            </form>
         </div>
-    </form>
+    </div>
 </div>
 
 <div id="changepic-profile-picture-template"><!--
@@ -50,7 +54,9 @@ <h3 id="changepic-modal-title">__MSG__PROFILE_PICTURE__</h3>
             <div class="oae-tile changepic-dropzone-content">
                 <i class="icon-group hide"></i>
                 <i class="icon-user hide"></i>
-                <small class="text-center">__MSG__DRAG_A_PHOTO_HERE_TO_UPLOAD__</small>
+                {if !oae.api.util.isHandheldDevice()}
+                    <small class="text-center">__MSG__DRAG_A_PHOTO_HERE_TO_UPLOAD__</small>
+                {/if}
             </div>
         {/if}
     </div>
diff --git a/node_modules/oae-core/changepic/css/changepic.css b/node_modules/oae-core/changepic/css/changepic.css
index f54807b969b..69829793043 100644
--- a/node_modules/oae-core/changepic/css/changepic.css
+++ b/node_modules/oae-core/changepic/css/changepic.css
@@ -13,20 +13,21 @@
  * permissions and limitations under the License.
  */
 
-#changepic-modal.changepic-initial-view {
-    margin-left: -130px;
+#changepic-modal .modal-content {
+    min-width: 500px;
+}
+
+#changepic-modal.changepic-initial-view .modal-content {
+    margin-left: 175px;
     width: 250px;
+    min-width: 250px;
 }
 
-/* TODO: Remove box-sizing in favor of globally applied rule */
 #changepic-modal .changepic-dropzone-content,
 #changepic-modal #changepic-dropzone {
     -webkit-box-shadow: none;
        -moz-box-shadow: none;
             box-shadow: none;
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-            box-sizing: border-box;
     height: 100%;
 }
 
@@ -94,7 +95,7 @@
 }
 
 #changepic-modal #changepic-jcrop {
-    max-height: 350px;
+    max-height: 330px;
     width: auto;
 }
 
@@ -103,3 +104,26 @@
 #changepic-modal .jcrop-holder {
     margin: 0 auto;
 }
+
+#changepic-modal .jcrop-keymgr {
+    display: block !important;   /* jCrop sets inline CSS to display: none; which makes the crop area inaccessible for keyboard users */
+    opacity: 0;                  /* https://github.com/tapmodo/Jcrop/issues/20 */
+}
+
+/* iPhone resolution */
+@media only screen and (min-device-width : 320px) and (max-device-width : 480px) {
+    #changepic-modal .modal-content {
+        min-width: inherit;
+    }
+
+    #changepic-modal.changepic-initial-view .modal-content {
+        margin-left: inherit;
+        width: auto;
+    }
+
+    #changepic-modal #changepic-jcrop {
+        max-height: 300px;
+        max-width: inherit;
+        width: 100%;
+    }
+}
diff --git a/node_modules/oae-core/changepic/js/changepic.js b/node_modules/oae-core/changepic/js/changepic.js
index a8d81729207..76e54cfdca8 100644
--- a/node_modules/oae-core/changepic/js/changepic.js
+++ b/node_modules/oae-core/changepic/js/changepic.js
@@ -133,7 +133,8 @@ define(['jquery', 'oae.core', 'jquery.jcrop', 'jquery.fileupload', 'jquery.ifram
          * @param  {Number}   progress   Number between 0 and 100 indicating the upload progress
          */
         var updateProgress = function(progress) {
-            $('.bar', $rootel).css('width', progress + '%');
+            $('.progress-bar', $rootel).css('width', progress + '%');
+            $('.progress-bar', $rootel).attr('aria-valuenow', Math.round(progress) + '%');
         };
 
 
@@ -239,6 +240,8 @@ define(['jquery', 'oae.core', 'jquery.jcrop', 'jquery.fileupload', 'jquery.ifram
                     );
                 }
             });
+
+            return false;
         };
 
         /**
@@ -252,10 +255,14 @@ define(['jquery', 'oae.core', 'jquery.jcrop', 'jquery.fileupload', 'jquery.ifram
                 'aspectRatio': 1,
                 'bgOpacity': 0.4,
                 'bgColor': '#FFF',
+                'touchSupport': true,
                 'minSize': [50, 50],
                 'setSelect': getDefaultCropSelection(),
                 'onSelect': calculateCoordinates
             });
+
+            // Focus jCrop for immediate keyboard access
+            $('#changepic-modal .jcrop-keymgr').focus();
         };
 
         /**
@@ -340,8 +347,8 @@ define(['jquery', 'oae.core', 'jquery.jcrop', 'jquery.fileupload', 'jquery.ifram
          * Adds binding to various elements in the widget
          */
         var addBinding = function() {
-            $('#changepic-set', $rootel).on('click', setPicture);
-            $('#changepic-modal', $rootel).on('hidden', reset);
+            $('#changepic-form', $rootel).on('submit', setPicture);
+            $('#changepic-modal', $rootel).on('hidden.bs.modal', reset);
 
             // Hide the spinning icon with jQuery (https://github.com/FortAwesome/Font-Awesome/issues/729)
             $('#changepic-uploading-container .icon-spinner', $rootel).hide();
diff --git a/node_modules/oae-core/comments/comments.html b/node_modules/oae-core/comments/comments.html
index fe11ec5b569..54f362c68a5 100755
--- a/node_modules/oae-core/comments/comments.html
+++ b/node_modules/oae-core/comments/comments.html
@@ -12,12 +12,10 @@
             ${renderThumbnail(oae.data.me)}
         </div>
         <div class="media-body">
-            <form class="comments-new-comment-form">
-                <div class="control-group">
-                    <div class="controls">
-                        <label for="comments-new-comment" class="oae-aural-text">__MSG__YOUR_COMMENT__</label>
-                        <textarea id="comments-new-comment" placeholder="__MSG__YOUR_COMMENT__" class="required maxlength-long"></textarea>
-                    </div>
+            <form class="comments-new-comment-form" role="form">
+                <div class="form-group">
+                    <label for="comments-new-comment" class="control-label oae-aural-text">__MSG__YOUR_COMMENT__</label>
+                    <textarea id="comments-new-comment" placeholder="__MSG__YOUR_COMMENT__" class="form-control required maxlength-long"></textarea>
                 </div>
                 <button type="submit" class="btn pull-right" title="__MSG__COMMENT__">__MSG__COMMENT__</button>
             </form>
diff --git a/node_modules/oae-core/comments/css/comments.css b/node_modules/oae-core/comments/css/comments.css
index a940ffd7d5a..08a442f25fd 100755
--- a/node_modules/oae-core/comments/css/comments.css
+++ b/node_modules/oae-core/comments/css/comments.css
@@ -13,16 +13,17 @@
  * permissions and limitations under the License.
  */
 
-.comments-widget {
-    margin-bottom: 15px;
-    padding: 12px 65px 12px 50px;
-}
-
 .comments-widget textarea {
+    height: 50px;
+    margin-top: 1px;
     resize: vertical;
     width: 100%;
 }
 
+.comments-widget .media-body {
+    word-wrap: break-word;
+}
+
 .comments-widget .comments-level-1 {
     margin-left: 70px;
 }
@@ -31,6 +32,10 @@
     margin-left: 140px;
 }
 
+.comments-widget .comments-new-reply-form button[type="submit"] {
+    margin-top: 12px;
+}
+
 .comments-widget .comments-reply-button i,
 .comments-widget .comments-delete-button i {
     font-size: 16px;
@@ -46,7 +51,3 @@
 .comments-widget small {
     font-size: 12px;
 }
-
-.comments-widget li.deleted h4.media-heading {
-    line-height: 3;
-}
diff --git a/node_modules/oae-core/comments/js/comments.js b/node_modules/oae-core/comments/js/comments.js
index 16a397adba5..d1b5baef947 100755
--- a/node_modules/oae-core/comments/js/comments.js
+++ b/node_modules/oae-core/comments/js/comments.js
@@ -231,6 +231,9 @@ define(['jquery', 'oae.core'], function($, oae) {
          * Initialize a new infinite scroll container that fetches the comments.
          */
         var setUpInfiniteScroll = function() {
+            // Render the new comment textarea
+            renderCreateNewComment();
+
             // Kill the infinite scroll if there is one
             if (infinityScroll) {
                 infinityScroll.kill();
@@ -247,7 +250,6 @@ define(['jquery', 'oae.core'], function($, oae) {
                 'postRenderer': setUpValidation
             });
 
-            renderCreateNewComment();
             setUpReplyComment();
             setUpDeleteComment();
         };
diff --git a/node_modules/oae-core/contentlibrary/contentlibrary.html b/node_modules/oae-core/contentlibrary/contentlibrary.html
index c1dbbcaccea..2b9ce854cb8 100755
--- a/node_modules/oae-core/contentlibrary/contentlibrary.html
+++ b/node_modules/oae-core/contentlibrary/contentlibrary.html
@@ -1,13 +1,13 @@
 <div id="contentlibrary-widget" class="oae-list-container">
     <div class="oae-list-options">
-        <div>
-            <button class="btn oae-list-options-toggle">
-                <h2>__MSG__LIBRARY__ <i class="icon-caret-down"></i></h2>
+        <div class="row">
+            <button class="btn col-xs-12 col-sm-6 oae-list-options-toggle">
+                <h2 class="pull-left">__MSG__LIBRARY__ <i class="icon-caret-down"></i></h2>
             </button>
-            <div class="pull-right">
-                <form class="form-search" id="contentlibrary-search-form">
-                    <label class="oae-aural-text" for="contentlibrary-search-query">__MSG__NARROW_BY_KEYWORD__</label>
-                    <input type="text" id="contentlibrary-search-query" class="search-query" placeholder="__MSG__NARROW_BY_KEYWORD__">
+            <div class="pull-right col-xs-12 col-sm-6">
+                <form id="contentlibrary-search-form" class="form-search" role="search">
+                    <label for="contentlibrary-search-query" class="control-label oae-aural-text">__MSG__NARROW_BY_KEYWORD__</label>
+                    <input type="text" id="contentlibrary-search-query" class="form-control pull-right search-query" placeholder="__MSG__NARROW_BY_KEYWORD__"/>
                 </form>
             </div>
         </div>
diff --git a/node_modules/oae-core/createcollabdoc/createcollabdoc.html b/node_modules/oae-core/createcollabdoc/createcollabdoc.html
index 7d6e6779a8b..62c6e2363bd 100644
--- a/node_modules/oae-core/createcollabdoc/createcollabdoc.html
+++ b/node_modules/oae-core/createcollabdoc/createcollabdoc.html
@@ -2,32 +2,34 @@
 <link rel="stylesheet" type="text/css" href="css/createcollabdoc.css" />
 
 <!-- MODAL -->
-<div id="createcollabdoc-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="createcollabdoc-modal-title" aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
-        <h3 id="createcollabdoc-modal-title">__MSG__CREATE_DOCUMENT__</h3>
-    </div>
-    <form id="createcollabdoc-form">
-        <div class="modal-body">
-            <div id="createcollabdoc-overview-container">
-                <div class="control-group">
-                    <label for="createcollabdoc-name"><h4>__MSG__DOCUMENT_TITLE__</h4></label>
-                    <div class="controls">
-                        <input type="text" id="createcollabdoc-name" class="required maxlength-short" name="createcollabdoc-name" placeholder="__MSG__WHAT_DO_YOU_WANT_TO_CALL_YOUR_DOCUMENT__"/>
+<div id="createcollabdoc-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="createcollabdoc-modal-title" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
+                <h3 id="createcollabdoc-modal-title">__MSG__CREATE_DOCUMENT__</h3>
+            </div>
+            <form id="createcollabdoc-form" role="form">
+                <div class="modal-body">
+                    <div id="createcollabdoc-overview-container">
+                        <div class="form-group">
+                            <label for="createcollabdoc-name" class="control-label"><h4>__MSG__DOCUMENT_TITLE__</h4></label>
+                            <input type="text" id="createcollabdoc-name" class="form-control required maxlength-short" name="createcollabdoc-name" placeholder="__MSG__WHAT_DO_YOU_WANT_TO_CALL_YOUR_DOCUMENT__"/>
+                        </div>
+                        <div id="createcollabdoc-permissions" class="well">
+                            <button type="button" id="createcollabdoc-change-permissions" class="btn pull-right">__MSG__CHANGE__</button>
+                            <div id="createcollabdoc-permissions-summary"><!-- --></div>
+                        </div>
                     </div>
+                    <div id="createcollabdoc-permissions-container" class="hide"><!-- --></div>
                 </div>
-                <div id="createcollabdoc-permissions" class="well">
-                    <button type="button" id="createcollabdoc-change-permissions" class="btn pull-right">__MSG__CHANGE__</button>
-                    <div id="createcollabdoc-permissions-summary"><!-- --></div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
+                    <button type="submit" id="createcollabdoc-create" class="btn btn-primary pull-right">__MSG__CREATE_DOCUMENT__</button>
                 </div>
-            </div>
-            <div id="createcollabdoc-permissions-container" class="hide"></div>
+            </form>
         </div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
-            <button type="submit" id="createcollabdoc-create" class="btn btn-primary pull-right">__MSG__CREATE_DOCUMENT__</button>
-        </div>
-    </form>
+    </div>
 </div>
 
 <!-- JAVASCRIPT -->
diff --git a/node_modules/oae-core/createcollabdoc/css/createcollabdoc.css b/node_modules/oae-core/createcollabdoc/css/createcollabdoc.css
index 33c359698fd..e23833a22bc 100644
--- a/node_modules/oae-core/createcollabdoc/css/createcollabdoc.css
+++ b/node_modules/oae-core/createcollabdoc/css/createcollabdoc.css
@@ -13,21 +13,13 @@
  * permissions and limitations under the License.
  */
 
-#createcollabdoc-modal form {
-    margin: 0;
-}
-
-#createcollabdoc-modal .modal-body label h4 {
-    margin-top: 0;
-}
-
 #createcollabdoc-modal #createcollabdoc-name {
     width: 100%;
 }
 
 #createcollabdoc-modal #createcollabdoc-permissions {
     margin: 25px 0 0;
-    max-height: 88px;
+    max-height: 140px;
     overflow: auto;
 }
 
diff --git a/node_modules/oae-core/createcollabdoc/js/createcollabdoc.js b/node_modules/oae-core/createcollabdoc/js/createcollabdoc.js
index 77ff36d10f9..476cfc074da 100644
--- a/node_modules/oae-core/createcollabdoc/js/createcollabdoc.js
+++ b/node_modules/oae-core/createcollabdoc/js/createcollabdoc.js
@@ -34,7 +34,7 @@ define(['jquery', 'oae.core'], function ($, oae) {
          * Resets the widget to its original state when the modal dialog is closed
          */
         var setUpReset = function() {
-            $('#createcollabdoc-modal', $rootel).on('hidden', function (evt) {
+            $('#createcollabdoc-modal', $rootel).on('hidden.bs.modal', function (evt) {
                 // Reset the form
                 var $form = $('#createcollabdoc-form', $rootel);
                 $form[0].reset();
@@ -152,7 +152,7 @@ define(['jquery', 'oae.core'], function ($, oae) {
                 });
             });
 
-            $('#createcollabdoc-modal', $rootel).on('shown', function() {
+            $('#createcollabdoc-modal', $rootel).on('shown.bs.modal', function() {
                 // Set focus to the collabdoc name field
                 $('#createcollabdoc-name', $rootel).focus();
                 // Initiate the permissions widget
diff --git a/node_modules/oae-core/creatediscussion/creatediscussion.html b/node_modules/oae-core/creatediscussion/creatediscussion.html
index 68c4f1c81f7..ce9a88b8dbc 100644
--- a/node_modules/oae-core/creatediscussion/creatediscussion.html
+++ b/node_modules/oae-core/creatediscussion/creatediscussion.html
@@ -2,38 +2,38 @@
 <link rel="stylesheet" type="text/css" href="css/creatediscussion.css" />
 
 <!-- MODAL -->
-<div id="creatediscussion-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="creatediscussion-modal-title" aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
-        <h3 id="creatediscussion-modal-title">__MSG__START_DISCUSSION__</h3>
-    </div>
-    <form id="creatediscussion-form">
-        <div class="modal-body">
-            <div id="creatediscussion-overview-container">
-                <div class="control-group">
-                    <label for="creatediscussion-name"><h4>__MSG__DISCUSSION_NAME__</h4></label>
-                    <div class="controls">
-                        <input type="text" id="creatediscussion-name" class="required maxlength-short" name="creatediscussion-name" placeholder="__MSG__WHAT_WOULD_YOU_LIKE_TO_CALL_YOUR_DISCUSSION__"/>
-                    </div>
-                </div>
-                <div class="control-group">
-                    <label for="creatediscussion-topic"><h4>__MSG__DISCUSSION_TOPIC__</h4></label>
-                    <div class="controls">
-                        <textarea id="creatediscussion-topic" class="required maxlength-medium" name="creatediscussion-topic" placeholder="__MSG__WHAT_WOULD_YOU_LIKE_TO_DISCUSS__" />
+<div id="creatediscussion-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="creatediscussion-modal-title" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
+                <h3 id="creatediscussion-modal-title">__MSG__START_DISCUSSION__</h3>
+            </div>
+            <form id="creatediscussion-form" role="form">
+                <div class="modal-body">
+                    <div id="creatediscussion-overview-container">
+                        <div class="form-group">
+                            <label for="creatediscussion-name" class="control-label"><h4>__MSG__DISCUSSION_NAME__</h4></label>
+                            <input type="text" id="creatediscussion-name" class="form-control required maxlength-short" name="creatediscussion-name" placeholder="__MSG__WHAT_WOULD_YOU_LIKE_TO_CALL_YOUR_DISCUSSION__"/>
+                        </div>
+                        <div class="form-group">
+                            <label for="creatediscussion-topic" class="control-label"><h4>__MSG__DISCUSSION_TOPIC__</h4></label>
+                            <textarea id="creatediscussion-topic" class="form-control required maxlength-medium" name="creatediscussion-topic" placeholder="__MSG__WHAT_WOULD_YOU_LIKE_TO_DISCUSS__"></textarea>
+                        </div>
+                        <div id="creatediscussion-permissions" class="well">
+                            <button type="button" id="creatediscussion-change-permissions" class="btn pull-right">__MSG__CHANGE__</button>
+                            <div id="creatediscussion-permissions-summary"><!-- --></div>
+                        </div>
                     </div>
+                    <div id="creatediscussion-permissions-container" class="hide"><!-- --></div>
                 </div>
-                <div id="creatediscussion-permissions" class="well">
-                    <button type="button" id="creatediscussion-change-permissions" class="btn pull-right">__MSG__CHANGE__</button>
-                    <div id="creatediscussion-permissions-summary"><!-- --></div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
+                    <button type="submit" id="creatediscussion-create" class="btn btn-primary pull-right">__MSG__START_DISCUSSION__</button>
                 </div>
-            </div>
-            <div id="creatediscussion-permissions-container" class="hide"></div>
-        </div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
-            <button type="submit" id="creatediscussion-create" class="btn btn-primary pull-right">__MSG__START_DISCUSSION__</button>
+            </form>
         </div>
-    </form>
+    </div>
 </div>
 
 <!-- JAVASCRIPT -->
diff --git a/node_modules/oae-core/creatediscussion/css/creatediscussion.css b/node_modules/oae-core/creatediscussion/css/creatediscussion.css
index 0a2b7a838de..a1871d56537 100644
--- a/node_modules/oae-core/creatediscussion/css/creatediscussion.css
+++ b/node_modules/oae-core/creatediscussion/css/creatediscussion.css
@@ -13,14 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#creatediscussion-modal form {
-    margin: 0;
-}
-
-#creatediscussion-modal .modal-body label h4 {
-    margin-top: 0;
-}
-
 #creatediscussion-modal #creatediscussion-name,
 #creatediscussion-modal #creatediscussion-topic {
     width: 100%;
@@ -33,7 +25,7 @@
 
 #creatediscussion-modal #creatediscussion-permissions {
     margin: 25px 0 0;
-    max-height: 88px;
+    max-height: 140px;
     overflow: auto;
 }
 
diff --git a/node_modules/oae-core/creatediscussion/js/creatediscussion.js b/node_modules/oae-core/creatediscussion/js/creatediscussion.js
index 824d42b59dc..c5e543c4ae1 100644
--- a/node_modules/oae-core/creatediscussion/js/creatediscussion.js
+++ b/node_modules/oae-core/creatediscussion/js/creatediscussion.js
@@ -34,7 +34,7 @@ define(['jquery', 'oae.core'], function ($, oae) {
          * Resets the widget to its original state when the modal dialog is closed
          */
         var setUpReset = function() {
-            $('#creatediscussion-modal', $rootel).on('hidden', function (evt) {
+            $('#creatediscussion-modal', $rootel).on('hidden.bs.modal', function (evt) {
                 // Reset the form
                 var $form = $('#creatediscussion-form', $rootel);
                 $form[0].reset();
@@ -147,7 +147,7 @@ define(['jquery', 'oae.core'], function ($, oae) {
                 });
             });
 
-            $('#creatediscussion-modal', $rootel).on('shown', function() {
+            $('#creatediscussion-modal', $rootel).on('shown.bs.modal', function() {
                 // IE10 has a problem where it treats the placeholder text as the textarea's
                 // value. Therefore, we need to explicitly clear the value of the textarea to
                 // make the placeholder behave like a placeholder.
diff --git a/node_modules/oae-core/creategroup/creategroup.html b/node_modules/oae-core/creategroup/creategroup.html
index f57ee5a6ffd..a4de672bf7e 100644
--- a/node_modules/oae-core/creategroup/creategroup.html
+++ b/node_modules/oae-core/creategroup/creategroup.html
@@ -2,59 +2,68 @@
 <link rel="stylesheet" type="text/css" href="css/creategroup.css" />
 
 <!-- MODAL -->
-<div id="creategroup-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="creategroup-modal-title" aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
-        <h3 id="creategroup-modal-title">__MSG__CREATE_GROUP__</h3>
-    </div>
-    <form id="creategroup-form">
-        <div class="modal-body">
-            <div class="control-group">
-                <label for="creategroup-name"><h4>__MSG__GROUP_NAME__</h4></label>
-                <div class="controls">
-                    <input type="text" id="creategroup-name" class="required maxlength-short" placeholder="__MSG__WHAT_DO_YOU_WANT_TO_CALL_YOUR_GROUP__"/>
-                </div>
+<div id="creategroup-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="creategroup-modal-title" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
+                <h3 id="creategroup-modal-title">__MSG__CREATE_GROUP__</h3>
             </div>
-            <div id="creategroup-visibility-container"><!-- --></div>
-        </div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
-            <button type="submit" class="btn btn-primary pull-right">__MSG__CREATE_GROUP__</button>
+            <form id="creategroup-form" role="form">
+                <div class="modal-body">
+                    <div class="form-group">
+                        <label for="creategroup-name" class="control-label"><h4>__MSG__GROUP_NAME__</h4></label>
+                        <input type="text" id="creategroup-name" class="form-control required maxlength-short" placeholder="__MSG__WHAT_DO_YOU_WANT_TO_CALL_YOUR_GROUP__"/>
+                    </div>
+                    <div id="creategroup-visibility-container"><!-- --></div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
+                    <button type="submit" class="btn btn-primary pull-right">__MSG__CREATE_GROUP__</button>
+                </div>
+            </form>
         </div>
-    </form>
+    </div>
 </div>
 
 <div id="creategroup-visibility-template"><!--
     {var tenant = oae.api.util.security().encodeForHTML(oae.data.me.tenant.displayName)}
     <h4>__MSG__VISIBILITY__</h4>
-    <div class="oae-large-options-container row-fluid">
-        <label for="oae-visibility-private" class="span4 text-center">
-            <div class="oae-large-options well pull-left text-center {if visibility === 'private'} checked{/if}">
-                <input type="radio" id="oae-visibility-private" value="private" name="oae-visibility-group" class="pull-left" {if visibility === 'private'} checked="checked"{/if} tabindex="0"/>
-                <i class="icon-oae-private large text-center"></i>
-                <span>__MSG__PARTICIPANTS_ONLY__</span>
-            </div>
-            <i class="icon-ok hide"></i>
-            <small>__MSG__GROUP_PRIVATE_DESCRIPTION__</small>
-        </label>
-        <label for="oae-visibility-loggedin" class="span4 text-center">
-            <div class="oae-large-options well pull-left text-center {if visibility === 'loggedin'} checked{/if}">
-                <input type="radio" id="oae-visibility-loggedin" value="loggedin" name="oae-visibility-group" class="pull-left" {if visibility === 'loggedin'} checked="checked"{/if} tabindex="0"/>
-                <i class="icon-oae-loggedin large text-center"></i>
-                <span>${tenant}</span>
-            </div>
-            <i class="icon-ok hide"></i>
-            <small>__MSG__GROUP_LOGGEDIN_DESCRIPTION__</small>
-        </label>
-        <label for="oae-visibility-public" class="span4 text-center">
-            <div class="oae-large-options well pull-left text-center {if visibility === 'public'} checked{/if}">
-                <input type="radio" id="oae-visibility-public" value="public" name="oae-visibility-group" class="pull-left" {if visibility === 'public'} checked="checked"{/if} tabindex="0"/>
-                <i class="icon-oae-public large text-center"></i>
-                <span>__MSG__PUBLIC__</span>
-            </div>
-            <i class="icon-ok hide"></i>
-            <small>__MSG__GROUP_PUBLIC_DESCRIPTION__</small>
-        </label>
+
+    <div class="oae-large-options-container row">
+        <div class="col-md-4 text-center">
+            <label for="oae-visibility-private" class="{if visibility === 'private'}checked{/if}">
+                <i class="icon-ok hide"></i>
+                <div class="oae-large-options well">
+                    <input type="radio" id="oae-visibility-private" value="private" name="oae-visibility-group" class="pull-left" {if visibility === 'private'} checked="checked"{/if} tabindex="0"/>
+                    <i class="icon-oae-private large text-center"></i>
+                    <span class="oae-threedots">__MSG__MEMBERS_ONLY__</span>
+                </div>
+                <small>__MSG__GROUP_PRIVATE_DESCRIPTION__</small>
+            </label>
+        </div>
+        <div class="col-md-4 text-center">
+            <label for="oae-visibility-loggedin" class="{if visibility === 'loggedin'} checked{/if}">
+                <i class="icon-ok hide"></i>
+                <div class="oae-large-options well">
+                    <input type="radio" id="oae-visibility-loggedin" value="loggedin" name="oae-visibility-group" class="pull-left" {if visibility === 'loggedin'} checked="checked"{/if} tabindex="0"/>
+                    <i class="icon-oae-loggedin large text-center"></i>
+                    <span class="oae-threedots">${tenant}</span>
+                </div>
+                <small>__MSG__GROUP_LOGGEDIN_DESCRIPTION__</small>
+            </label>
+        </div>
+        <div class="col-md-4 text-center">
+            <label for="oae-visibility-public" class="{if visibility === 'public'} checked{/if}">
+                <i class="icon-ok hide"></i>
+                <div class="oae-large-options well">
+                    <input type="radio" id="oae-visibility-public" value="public" name="oae-visibility-group" class="pull-left" {if visibility === 'public'} checked="checked"{/if} tabindex="0"/>
+                    <i class="icon-oae-public large text-center"></i>
+                    <span class="oae-threedots">__MSG__PUBLIC__</span>
+                </div>
+                <small>__MSG__GROUP_PUBLIC_DESCRIPTION__</small>
+            </label>
+        </div>
     </div>
 --></div>
 
diff --git a/node_modules/oae-core/creategroup/css/creategroup.css b/node_modules/oae-core/creategroup/css/creategroup.css
index 99121fe3330..0b21cb90e96 100644
--- a/node_modules/oae-core/creategroup/css/creategroup.css
+++ b/node_modules/oae-core/creategroup/css/creategroup.css
@@ -13,8 +13,12 @@
  * permissions and limitations under the License.
  */
 
-#creategroup-modal #creategroup-form {
-    margin-bottom: 0;
+#creategroup-modal .modal-body {
+    padding: 5px 25px 0;
+}
+
+#creategroup-modal .modal-footer {
+    padding: 0 25px 15px 15px;
 }
 
 #creategroup-modal #creategroup-name {
diff --git a/node_modules/oae-core/creategroup/js/creategroup.js b/node_modules/oae-core/creategroup/js/creategroup.js
index 6fd184fb408..68731ce6f05 100644
--- a/node_modules/oae-core/creategroup/js/creategroup.js
+++ b/node_modules/oae-core/creategroup/js/creategroup.js
@@ -24,7 +24,7 @@ define(['jquery', 'oae.core'], function($, oae) {
          * Resets the widget to its original state when the modal dialog is closed
          */
         var setUpReset = function() {
-            $('#creategroup-modal').on('hidden', function() {
+            $('#creategroup-modal').on('hidden.bs.modal', function() {
                 // Reset the form
                 var $form = $('#creategroup-form', $rootel);
                 $form[0].reset();
@@ -42,8 +42,8 @@ define(['jquery', 'oae.core'], function($, oae) {
             }, $('#creategroup-visibility-container', $rootel));
 
             $rootel.on('change', '.oae-large-options-container input[type="radio"]', function() {
-                $('.oae-large-options', $rootel).removeClass('checked');
-                $(this).parents('.oae-large-options').addClass('checked');
+                $('.oae-large-options-container label', $rootel).removeClass('checked');
+                $(this).parents('label').addClass('checked');
             });
         };
 
@@ -82,10 +82,11 @@ define(['jquery', 'oae.core'], function($, oae) {
                 $('#creategroup-modal', $rootel).modal({
                     'backdrop': 'static'
                 });
-                $('#creategroup-modal', $rootel).on('shown', function () {
-                    // Set focus to the group name field
-                    $('#creategroup-name', $rootel).focus();
-                });
+            });
+
+            $('#creategroup-modal', $rootel).on('shown.bs.modal', function () {
+                // Set focus to the group name field
+                $('#creategroup-name', $rootel).focus();
             });
         };
 
diff --git a/node_modules/oae-core/createlink/createlink.html b/node_modules/oae-core/createlink/createlink.html
index fce8615541f..51773798ed9 100644
--- a/node_modules/oae-core/createlink/createlink.html
+++ b/node_modules/oae-core/createlink/createlink.html
@@ -2,29 +2,33 @@
 <link rel="stylesheet" type="text/css" href="css/createlink.css" />
 
 <!-- MODAL -->
-<div id="createlink-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="createlink-modal-title" aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
-        <h3 id="createlink-modal-title">__MSG__ADD_LINKS__</h3>
-    </div>
-    <div class="modal-body">
-        <div id="createlink-link-dump-container">
-            <label for="createlink-link-dump" class="oae-aural-text">__MSG__ENTER_OR_PASTE_LINKS_HERE__</label>
-            <textarea id="createlink-link-dump" placeholder="__MSG__ENTER_OR_PASTE_LINKS_HERE__"></textarea>
-        </div>
-        <div id="createlink-overview-container" class="hide">
-            <ul id="createlink-selected-container" class="oae-list oae-list-compact"><!-- --></ul>
-            <div id="createlink-permissions" class="well">
-                <button id="createlink-change-permissions" class="btn pull-right">__MSG__CHANGE__</button>
-                <div id="createlink-permissions-summary"><!-- --></div>
+<div id="createlink-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="createlink-modal-title" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
+                <h3 id="createlink-modal-title">__MSG__ADD_LINKS__</h3>
+            </div>
+            <div class="modal-body">
+                <div id="createlink-link-dump-container">
+                    <label for="createlink-link-dump" class="oae-aural-text">__MSG__ENTER_OR_PASTE_LINKS_HERE__</label>
+                    <textarea id="createlink-link-dump" class="form-control" placeholder="__MSG__ENTER_OR_PASTE_LINKS_HERE__" autocapitalize="off"></textarea>
+                </div>
+                <div id="createlink-overview-container" class="hide">
+                    <ul id="createlink-selected-container" class="oae-list oae-list-compact"><!-- --></ul>
+                    <div id="createlink-permissions" class="well">
+                        <button id="createlink-change-permissions" class="btn pull-right">__MSG__CHANGE__</button>
+                        <div id="createlink-permissions-summary"><!-- --></div>
+                    </div>
+                </div>
+                <div id="createlink-permissions-container" class="hide"><!-- --></div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
+                <button type="button" id="createlink-next" class="btn btn-primary pull-right" aria-hidden="true" disabled="disabled">__MSG__NEXT__</button>
+                <button type="button" id="createlink-create" class="btn btn-primary pull-right hide" data-dismiss="modal">__MSG__ADD_LINKS__</button>
             </div>
         </div>
-        <div id="createlink-permissions-container" class="hide"></div>
-    </div>
-    <div class="modal-footer">
-        <button class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
-        <button id="createlink-next" class="btn btn-primary pull-right" aria-hidden="true" disabled="disabled">__MSG__NEXT__</button>
-        <button id="createlink-create" class="btn btn-primary pull-right hide" data-dismiss="modal">__MSG__ADD_LINKS__</button>
     </div>
 </div>
 
@@ -33,7 +37,7 @@ <h3 id="createlink-modal-title">__MSG__ADD_LINKS__</h3>
         {var linkName = oae.api.util.security().encodeForHTML(link.displayName)}
         <li class="oae-list-item" tabindex="${link_index}">
             <div class="oae-list-compact-item">
-                <div class="oae-listitem oae-listitem-compact">
+                <div class="clearfix oae-listitem oae-listitem-compact">
                     <div class="oae-thumbnail icon-oae-link"></div>
                     <div class="pull-left">
                         <div class="createlink-selected-name oae-threedots jeditable-field" rel="tooltip" data-placement="right" data-original-title="__MSG__CLICK_TO_RENAME__" tabindex="0">${link.displayName|encodeForHTML}</div>
diff --git a/node_modules/oae-core/createlink/css/createlink.css b/node_modules/oae-core/createlink/css/createlink.css
index efc1d3a0948..d7ae17d67bd 100644
--- a/node_modules/oae-core/createlink/css/createlink.css
+++ b/node_modules/oae-core/createlink/css/createlink.css
@@ -32,7 +32,7 @@
 
 #createlink-modal #createlink-permissions {
     margin: 12px 0 0;
-    max-height: 88px;
+    max-height: 140px;
     overflow: auto;
 }
 
@@ -56,3 +56,22 @@
     padding: 0;
     width: 370px !important;
 }
+
+/* Add an IE9 fallback for threedots */
+@media (min-width: 550px) {
+    .ie-lt10 .createlink-selected-name {
+        max-width: 375px !important;
+    }
+}
+
+@media (min-width: 400px) and (max-width: 550px) {
+    .ie-lt10 .createlink-selected-name {
+        max-width: 220px !important;
+    }
+}
+
+@media (max-width: 400px) {
+    .ie-lt10 .createlink-selected-name {
+        max-width: 140px !important;
+    }
+}
diff --git a/node_modules/oae-core/createlink/js/createlink.js b/node_modules/oae-core/createlink/js/createlink.js
index d8ef49af741..7851445d852 100644
--- a/node_modules/oae-core/createlink/js/createlink.js
+++ b/node_modules/oae-core/createlink/js/createlink.js
@@ -65,7 +65,7 @@ define(['jquery', 'oae.core', 'jquery.jeditable'], function($, oae) {
 
             // Show the first step
             $('#createlink-link-dump-container', $rootel).show();
-            $('#createlink-modal > .modal-footer', $rootel).show();
+            $('#createlink-modal .modal-content > .modal-footer', $rootel).show();
 
             // Reset controls
             $('#createlink-next', $rootel).prop('disabled', true);
@@ -193,7 +193,7 @@ define(['jquery', 'oae.core', 'jquery.jeditable'], function($, oae) {
         var showPermissions = function() {
             // Hide all containers
             $('#createlink-modal .modal-body > div:visible', $rootel).hide();
-            $('#createlink-modal > .modal-footer', $rootel).hide();
+            $('#createlink-modal .modal-content > .modal-footer', $rootel).hide();
             // Show the permissions container
             $('#createlink-modal .modal-body > div#createlink-permissions-container', $rootel).show();
             $('#createlink-create', $rootel).hide();
@@ -207,7 +207,7 @@ define(['jquery', 'oae.core', 'jquery.jeditable'], function($, oae) {
             $('#createlink-modal .modal-body > div:visible', $rootel).hide();
             $('#createlink-next', $rootel).hide();
             // Show the overview container
-            $('#createlink-modal > .modal-footer', $rootel).show();
+            $('#createlink-modal .modal-content > .modal-footer', $rootel).show();
             $('#createlink-modal .modal-body > div#createlink-overview-container', $rootel).show();
             $('#createlink-create', $rootel).show();
         };
@@ -246,7 +246,7 @@ define(['jquery', 'oae.core', 'jquery.jeditable'], function($, oae) {
          * Reset the widget when the modal dialog is closed
          */
         var setUpReset = function() {
-            $('#createlink-modal', $rootel).on('hidden', function(ev) {
+            $('#createlink-modal', $rootel).on('hidden.bs.modal', function(ev) {
                 // Bootstrap will send out a `hidden` event when certain components are destroyed.
                 // We can only reset the widget when the modal is closed though.
                 // e.g. `$('[rel="tooltip"]', $rootel).tooltip('destroy');`
@@ -430,15 +430,16 @@ define(['jquery', 'oae.core', 'jquery.jeditable'], function($, oae) {
                 $('#createlink-modal', $rootel).modal({
                     'backdrop': 'static'
                 });
-                $('#createlink-modal', $rootel).on('shown', function() {
-                    // IE10 has a problem where it treats the placeholder text as the textarea's
-                    // value. Therefore, we need to explicitly clear the value of the textarea to
-                    // make the placeholder behave like a placeholder.
-                    // @see https://github.com/oaeproject/3akai-ux/pull/2906
-                    $('#createlink-link-dump', $rootel).val('');
-                    // Set focus to the link dump textarea
-                    $('#createlink-link-dump', $rootel).focus();
-                });
+            });
+
+            $('#createlink-modal', $rootel).on('shown.bs.modal', function() {
+                // IE10 has a problem where it treats the placeholder text as the textarea's
+                // value. Therefore, we need to explicitly clear the value of the textarea to
+                // make the placeholder behave like a placeholder.
+                // @see https://github.com/oaeproject/3akai-ux/pull/2906
+                $('#createlink-link-dump', $rootel).val('');
+                // Set focus to the link dump textarea
+                $('#createlink-link-dump', $rootel).focus();
             });
 
             // Binds the 'change' button that shows the setpermissions widget
diff --git a/node_modules/oae-core/deleteresource/deleteresource.html b/node_modules/oae-core/deleteresource/deleteresource.html
index c4193557e62..c8d27e1f5c6 100644
--- a/node_modules/oae-core/deleteresource/deleteresource.html
+++ b/node_modules/oae-core/deleteresource/deleteresource.html
@@ -2,59 +2,63 @@
 <link rel="stylesheet" type="text/css" href="css/deleteresource.css" />
 
 <!-- MODAL -->
-<div id="deleteresource-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="deleteresource-modal-title" aria-hidden="true"><!-- --></div>
+<div id="deleteresource-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="deleteresource-modal-title" aria-hidden="true"><!-- --></div>
 
 <div id="deleteresource-template"><!--
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
-        <h3 id="deleteresource-modal-title">
-            {if contextProfile.resourceType === 'discussion'}
-                __MSG__DELETE_DISCUSSION__
-            {else}
-                {if contextProfile.resourceSubType === 'collabdoc'}
-                    __MSG__DELETE_DOCUMENT__
-                {elseif contextProfile.resourceSubType === 'file'}
-                    __MSG__DELETE_FILE__
-                {elseif contextProfile.resourceSubType === 'link'}
-                    __MSG__DELETE_LINK__
-                {/if}
-            {/if}
-        </h3>
-    </div>
-    <div class="modal-body">
-        <h4>
-            {if contextProfile.resourceType === 'discussion'}
-                __MSG__ARE_YOU_SURE_YOU_WANT_TO_DELETE_THIS_DISCUSSION__
-            {else}
-                {if contextProfile.resourceSubType === 'collabdoc'}
-                    __MSG__ARE_YOU_SURE_YOU_WANT_TO_DELETE_THIS_DOCUMENT__
-                {elseif contextProfile.resourceSubType === 'file'}
-                    __MSG__ARE_YOU_SURE_YOU_WANT_TO_DELETE_THIS_FILE__
-                {elseif contextProfile.resourceSubType === 'link'}
-                    __MSG__ARE_YOU_SURE_YOU_WANT_TO_DELETE_THIS_LINK__
-                {/if}
-            {/if}
-        </h4>
-        <div class="alert alert-danger text-center">
-            __MSG__CAUTION_THIS_ACTION_CANNOT_BE_UNDONE__
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
+                <h3 id="deleteresource-modal-title">
+                    {if contextProfile.resourceType === 'discussion'}
+                        __MSG__DELETE_DISCUSSION__
+                    {else}
+                        {if contextProfile.resourceSubType === 'collabdoc'}
+                            __MSG__DELETE_DOCUMENT__
+                        {elseif contextProfile.resourceSubType === 'file'}
+                            __MSG__DELETE_FILE__
+                        {elseif contextProfile.resourceSubType === 'link'}
+                            __MSG__DELETE_LINK__
+                        {/if}
+                    {/if}
+                </h3>
+            </div>
+            <div class="modal-body">
+                <h4>
+                    {if contextProfile.resourceType === 'discussion'}
+                        __MSG__ARE_YOU_SURE_YOU_WANT_TO_DELETE_THIS_DISCUSSION__
+                    {else}
+                        {if contextProfile.resourceSubType === 'collabdoc'}
+                            __MSG__ARE_YOU_SURE_YOU_WANT_TO_DELETE_THIS_DOCUMENT__
+                        {elseif contextProfile.resourceSubType === 'file'}
+                            __MSG__ARE_YOU_SURE_YOU_WANT_TO_DELETE_THIS_FILE__
+                        {elseif contextProfile.resourceSubType === 'link'}
+                            __MSG__ARE_YOU_SURE_YOU_WANT_TO_DELETE_THIS_LINK__
+                        {/if}
+                    {/if}
+                </h4>
+                <div class="alert alert-danger text-center">
+                    __MSG__CAUTION_THIS_ACTION_CANNOT_BE_UNDONE__
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
+                <button type="button" id="deleteresource-delete" class="btn btn-danger pull-right">
+                    {if contextProfile.resourceType === 'discussion'}
+                        __MSG__DELETE_DISCUSSION__
+                    {else}
+                        {if contextProfile.resourceSubType === 'collabdoc'}
+                            __MSG__DELETE_DOCUMENT__
+                        {elseif contextProfile.resourceSubType === 'file'}
+                            __MSG__DELETE_FILE__
+                        {elseif contextProfile.resourceSubType === 'link'}
+                            __MSG__DELETE_LINK__
+                        {/if}
+                    {/if}
+                </button>
+            </div>
         </div>
     </div>
-    <div class="modal-footer">
-        <button type="button" class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
-        <button id="deleteresource-delete" class="btn btn-danger pull-right">
-            {if contextProfile.resourceType === 'discussion'}
-                __MSG__DELETE_DISCUSSION__
-            {else}
-                {if contextProfile.resourceSubType === 'collabdoc'}
-                    __MSG__DELETE_DOCUMENT__
-                {elseif contextProfile.resourceSubType === 'file'}
-                    __MSG__DELETE_FILE__
-                {elseif contextProfile.resourceSubType === 'link'}
-                    __MSG__DELETE_LINK__
-                {/if}
-            {/if}
-        </button>
-    </div>
 --></div>
 
 <div id="deleteresource-notification-title-template"><!--
diff --git a/node_modules/oae-core/deleteresources/css/deleteresources.css b/node_modules/oae-core/deleteresources/css/deleteresources.css
index 25730aa747c..75ad50df929 100644
--- a/node_modules/oae-core/deleteresources/css/deleteresources.css
+++ b/node_modules/oae-core/deleteresources/css/deleteresources.css
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#deleteresources-modal .modal-body {
-    max-height: 450px;
-}
-
 /* Resource list */
 
 #deleteresources-modal #deleteresources-overview-container ul {
@@ -25,7 +21,8 @@
     overflow: auto;
 }
 
-#deleteresources-modal #deleteresources-overview-container ul .oae-listitem h3 {
+/* Add an IE9 fallback for threedots */
+.ie-lt10 #deleteresources-modal #deleteresources-overview-container ul .oae-listitem h3 {
     max-width: 300px;
 }
 
diff --git a/node_modules/oae-core/deleteresources/deleteresources.html b/node_modules/oae-core/deleteresources/deleteresources.html
index 22c0ef13c28..ec4d21cae6f 100644
--- a/node_modules/oae-core/deleteresources/deleteresources.html
+++ b/node_modules/oae-core/deleteresources/deleteresources.html
@@ -2,20 +2,24 @@
 <link rel="stylesheet" type="text/css" href="css/deleteresources.css" />
 
 <!-- MODAL -->
-<div id="deleteresources-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="deleteresources-modal-title" aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
-        <h3 id="deleteresources-modal-title"><!-- --></h3>
-    </div>
-    <div class="modal-body">
-        <!-- PROGRESS VIEW -->
-        <div id="deleteresources-progress-container">
-            <div class="progress">
-                <div class="bar"></div>
+<div id="deleteresources-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="deleteresources-modal-title" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
+                <h3 id="deleteresources-modal-title"><!-- --></h3>
+            </div>
+            <div class="modal-body">
+                <!-- PROGRESS VIEW -->
+                <div id="deleteresources-progress-container">
+                    <div class="progress">
+                        <div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
+                    </div>
+                </div>
+                <!-- OVERVIEW VIEW -->
+                <div id="deleteresources-overview-container" class="hide"><!-- --></div>
             </div>
         </div>
-        <!-- OVERVIEW VIEW -->
-        <div id="deleteresources-overview-container" class="hide"><!-- --></div>
     </div>
 </div>
 
@@ -98,22 +102,22 @@ <h4>
     </ul>
 
     {if canManage}
-        <div class="row-fluid">
-            <div class="span6 well text-center">
-                <div>
+        <div class="row">
+            <div class="col-sm-6 text-center">
+                <div class="well">
                     <button type="button" class="btn" id="deleteresources-manage-delete-library">
                         <i class="icon-unlink pull-left"></i> __MSG__DELETE_FROM_LIBRARY__
                     </button>
+                    <small>__MSG__DELETE_FROM_LIBRARY_DESCRIPTION__</small>
                 </div>
-                <small>__MSG__DELETE_FROM_LIBRARY_DESCRIPTION__</small>
             </div>
-            <div class="span6 well text-center">
-                <div>
+            <div class="col-sm-6 text-center">
+                <div class="well">
                     <button type="button" class="btn btn-primary" id="deleteresources-manage-delete-system">
                         <i class="icon-trash pull-left"></i> __MSG__DELETE_FROM_SYSTEM__
                     </button>
+                    <small>__MSG__DELETE_FROM_SYSTEM_DESCRIPTION__</small>
                 </div>
-                <small>__MSG__DELETE_FROM_SYSTEM_DESCRIPTION__</small>
             </div>
         </div>
     {else}
diff --git a/node_modules/oae-core/deleteresources/js/deleteresources.js b/node_modules/oae-core/deleteresources/js/deleteresources.js
index 12ca2c0a553..533fd1602b9 100644
--- a/node_modules/oae-core/deleteresources/js/deleteresources.js
+++ b/node_modules/oae-core/deleteresources/js/deleteresources.js
@@ -44,7 +44,7 @@ define(['jquery', 'oae.core'], function ($, oae) {
          * Resets the state of the widget when the modal dialog has been closed
          */
         var setUpReset = function() {
-            $('#deleteresources-modal').on('hidden', function(ev) {
+            $('#deleteresources-modal').on('hidden.bs.modal', function(ev) {
                 // Reset the selected resources
                 selectedResources = [];
                 selectedResourcesManage = [];
@@ -68,7 +68,8 @@ define(['jquery', 'oae.core'], function ($, oae) {
          * @param  {Number}   progress   Number between 0 and 100 indicating progress
          */
         var updateProgress = function(progress) {
-            $('.bar', $rootel).css('width', progress + '%');
+            $('.progress-bar', $rootel).css('width', progress + '%');
+            $('.progress-bar', $rootel).attr('aria-valuenow', progress.toFixed(2) + '%');
         };
 
         /**
diff --git a/node_modules/oae-core/discussion/css/discussion.css b/node_modules/oae-core/discussion/css/discussion.css
new file mode 100644
index 00000000000..3fe87b1c0e5
--- /dev/null
+++ b/node_modules/oae-core/discussion/css/discussion.css
@@ -0,0 +1,18 @@
+/*!
+ * Copyright 2013 Apereo Foundation (AF) Licensed under the
+ * Educational Community License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may
+ * obtain a copy of the License at
+ *
+ *     http://opensource.org/licenses/ECL-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS"
+ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#discussion-topic {
+    margin: 20px 0 40px;
+}
diff --git a/node_modules/oae-core/discussion/discussion.html b/node_modules/oae-core/discussion/discussion.html
new file mode 100644
index 00000000000..315064364ea
--- /dev/null
+++ b/node_modules/oae-core/discussion/discussion.html
@@ -0,0 +1,8 @@
+<!-- CSS -->
+<link rel="stylesheet" type="text/css" href="css/discussion.css" />
+
+<!-- DISCUSSION TOPIC -->
+<div id="discussion-topic" class="well"><!-- --></div>
+
+<!-- JAVASCRIPT -->
+<script type="text/javascript" src="js/discussion.js"></script>
diff --git a/node_modules/oae-core/discussion/js/discussion.js b/node_modules/oae-core/discussion/js/discussion.js
new file mode 100644
index 00000000000..57317840c58
--- /dev/null
+++ b/node_modules/oae-core/discussion/js/discussion.js
@@ -0,0 +1,46 @@
+/*!
+ * Copyright 2013 Apereo Foundation (AF) Licensed under the
+ * Educational Community License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may
+ * obtain a copy of the License at
+ *
+ *     http://opensource.org/licenses/ECL-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS"
+ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+define(['jquery', 'oae.core'], function($, oae) {
+
+    return function(uid, showSettings, widgetData) {
+
+        // The widget container
+        var $rootel = $('#' + uid);
+
+        /**
+         * Render the discussion topic
+         */
+        var renderDiscussionTopic = function(topic) {
+            $('#discussion-topic', $rootel).html(oae.api.util.security().encodeForHTMLWithLinks(topic).replace(/\n/g, '<br/>'));
+            $('#discussion-topic-container', $rootel).show();
+        };
+
+        /**
+         * Initialize the discussion topic and add a binding for topic updates
+         */
+        var initDiscussion = function() {
+            if (widgetData.description) {
+                renderDiscussionTopic(widgetData.description);
+            }
+
+            $(document).on('oae.editdiscussion.done', function(ev, data) {
+                renderDiscussionTopic(data.description);
+            });
+        };
+
+        initDiscussion();
+    };
+});
diff --git a/node_modules/oae-core/discussion/manifest.json b/node_modules/oae-core/discussion/manifest.json
new file mode 100644
index 00000000000..8a82832c942
--- /dev/null
+++ b/node_modules/oae-core/discussion/manifest.json
@@ -0,0 +1,3 @@
+{
+    "src": "discussion.html"
+}
diff --git a/node_modules/oae-core/discussionslibrary/discussionslibrary.html b/node_modules/oae-core/discussionslibrary/discussionslibrary.html
index 925622c2633..3021b85b793 100644
--- a/node_modules/oae-core/discussionslibrary/discussionslibrary.html
+++ b/node_modules/oae-core/discussionslibrary/discussionslibrary.html
@@ -1,13 +1,13 @@
 <div id="discussionslibrary-widget" class="oae-list-container">
     <div class="oae-list-options">
-        <div>
-            <button class="btn oae-list-options-toggle">
-                <h2>__MSG__DISCUSSIONS__ <i class="icon-caret-down"></i></h2>
+        <div class="row">
+            <button class="btn col-xs-12 col-sm-6 oae-list-options-toggle">
+                <h2 class="pull-left">__MSG__DISCUSSIONS__ <i class="icon-caret-down"></i></h2>
             </button>
-            <div class="pull-right">
-                <form class="form-search" id="discussionslibrary-search-form">
-                    <label class="oae-aural-text" for="discussionslibrary-search-query">__MSG__NARROW_BY_KEYWORD__</label>
-                    <input type="text" id="discussionslibrary-search-query" class="search-query" placeholder="__MSG__NARROW_BY_KEYWORD__">
+            <div class="pull-right col-xs-12 col-sm-6">
+                <form id="discussionslibrary-search-form" class="form-search" role="search">
+                    <label for="discussionslibrary-search-query" class="control-label oae-aural-text">__MSG__NARROW_BY_KEYWORD__</label>
+                    <input type="text" id="discussionslibrary-search-query" class="form-control pull-right search-query" placeholder="__MSG__NARROW_BY_KEYWORD__"/>
                 </form>
             </div>
         </div>
diff --git a/node_modules/oae-core/documentpreview/css/documentpreview.css b/node_modules/oae-core/documentpreview/css/documentpreview.css
index a7c8c0c3c40..a74e0b61b2e 100644
--- a/node_modules/oae-core/documentpreview/css/documentpreview.css
+++ b/node_modules/oae-core/documentpreview/css/documentpreview.css
@@ -14,41 +14,45 @@
 */
 
 #documentpreview-widget #documentpreview-container {
-    padding: 20px 65px 30px 50px;
+    padding: 20px 0 30px;
 }
 
 /* Toolbar */
 
-#documentpreview-widget .documentpreview-toolbar {
-    margin-bottom: 0;
+#documentpreview-widget #documentpreview-toolbar {
+    margin: 0;
     padding: 5px;
 }
 
-#documentpreview-widget .documentpreview-toolbar .documentpreview-toolbar-text {
+#documentpreview-widget #documentpreview-toolbar #documentpreview-page-controls > * {
+    display: inline-block;
     position: relative;
-    top: 1px;
+    top: 2px;
+}
+
+#documentpreview-widget #documentpreview-toolbar #documentpreview-toolbar-text {
+    margin: 0 2px;
+    top: 3px;
 }
 
-#documentpreview-widget .documentpreview-toolbar .documentpreview-view-controls {
-    margin-left: 20px;
+#documentpreview-widget #documentpreview-toolbar .documentpreview-view-controls {
     padding-top: 4px;
 }
 
-#documentpreview-widget .documentpreview-toolbar .documentpreview-view-controls .documentpreview-full-screen {
+#documentpreview-widget #documentpreview-toolbar .documentpreview-view-controls .documentpreview-full-screen {
     margin-left: 30px;
 }
 
-#documentpreview-widget .documentpreview-toolbar .documentpreview-page-controls {
-    margin-bottom: 0px;
-    margin-right: 20px;
+#documentpreview-widget #documentpreview-toolbar #documentpreview-page-controls {
+    margin-bottom: 0;
 }
 
-#documentpreview-widget .documentpreview-toolbar .documentpreview-page-controls input {
+#documentpreview-widget #documentpreview-toolbar #documentpreview-page-controls input {
     position: relative;
-    top: 5px;
+    top: 2px;
 }
 
-#documentpreview-widget .documentpreview-toolbar .documentpreview-page-controls input.documentpreview-page-num {
+#documentpreview-widget #documentpreview-toolbar #documentpreview-page-controls input#documentpreview-page-num {
     width: 40px;
 }
 
@@ -72,6 +76,10 @@
     top: 72px;
 }
 
+#documentpreview-widget.documentpreview-widget-fullscreen #documentpreview-toolbar {
+    margin: 0 20px;
+}
+
 /* Page content */
 
 #documentpreview-widget .documentpreview-content {
diff --git a/node_modules/oae-core/documentpreview/documentpreview.html b/node_modules/oae-core/documentpreview/documentpreview.html
index b97acf4cfe3..0cb20395466 100644
--- a/node_modules/oae-core/documentpreview/documentpreview.html
+++ b/node_modules/oae-core/documentpreview/documentpreview.html
@@ -5,8 +5,8 @@
 <div id="documentpreview-widget">
     <div id="documentpreview-container">
         <!-- TOOLBAR -->
-        <div class="documentpreview-toolbar well well-small clearfix">
-            <span class="documentpreview-view-controls pull-left">
+        <div id="documentpreview-toolbar" class="well well-small clearfix row">
+            <span class="documentpreview-view-controls col-xs-12 col-sm-6 col-md-6">
                 <button type="button" class="documentpreview-zoom-in btn btn-link" title="__MSG__ZOOM_IN__">
                     <i class="icon-zoom-in"><span class="oae-aural-text">__MSG__ZOOM_IN__</span></i>
                 </button>
@@ -18,17 +18,21 @@
                 </button>
             </span>
 
-            <form class="documentpreview-page-controls pull-right">
+            <form id="documentpreview-page-controls" class="text-right col-xs-12 col-sm-6 col-md-6" role="form">
                 <button type="button" class="documentpreview-page-prev btn btn-link" title="__MSG__PREV_PAGE__">
-                    <i class="icon-caret-left"><span class="oae-aural-text">__MSG__PREV_PAGE__</span></i>
+                    <i class="icon-caret-left">
+                        <span class="oae-aural-text">__MSG__PREV_PAGE__</span>
+                    </i>
                 </button>
                 <span class="documentpreview-page-label documentpreview-toolbar-text">__MSG__PAGE_X_OF_Y_PREFIX__</span>
-                <input class="documentpreview-page-num input-mini text-center" type="text">
+                <input id="documentpreview-page-num" class="form-control text-center" type="text">
                 <span class="documentpreview-toolbar-text">__MSG__PAGE_X_OF_Y_MIDDLE__</span>
                 <span class="documentpreview-page-count documentpreview-toolbar-text"></span>
                 <span class="documentpreview-page-label documentpreview-toolbar-text">__MSG__PAGE_X_OF_Y_SUFFIX__</span>
                 <button type="button" class="documentpreview-page-next btn btn-link" title="__MSG__NEXT_PAGE__">
-                    <i class="icon-caret-right"><span class="oae-aural-text">__MSG__NEXT_PAGE__</span></i>
+                    <i class="icon-caret-right">
+                        <span class="oae-aural-text">__MSG__NEXT_PAGE__</span>
+                    </i>
                 </button>
             </form>
         </div>
diff --git a/node_modules/oae-core/documentpreview/js/documentpreview.js b/node_modules/oae-core/documentpreview/js/documentpreview.js
index f59565d9df1..206b8ca8c68 100644
--- a/node_modules/oae-core/documentpreview/js/documentpreview.js
+++ b/node_modules/oae-core/documentpreview/js/documentpreview.js
@@ -53,9 +53,9 @@ define(['jquery', 'underscore', 'oae.core', 'lazyload'], function($, _, oae) {
         var $zoomIn = $('.documentpreview-zoom-in', $rootel);
         var $zoomOut = $('.documentpreview-zoom-out', $rootel);
         var $fullScreen = $('.documentpreview-full-screen', $rootel);
-        var $pageControls = $('.documentpreview-page-controls', $rootel);
+        var $pageControls = $('#documentpreview-page-controls', $rootel);
         var $prevPage = $('.documentpreview-page-prev', $rootel);
-        var $pageNumber = $('.documentpreview-page-num', $rootel);
+        var $pageNumber = $('#documentpreview-page-num', $rootel);
         var $nextPage = $('.documentpreview-page-next', $rootel);
 
 
diff --git a/node_modules/oae-core/editcontent/css/editcontent.css b/node_modules/oae-core/editcontent/css/editcontent.css
index 8bdda005f4a..6242dfe0d2c 100644
--- a/node_modules/oae-core/editcontent/css/editcontent.css
+++ b/node_modules/oae-core/editcontent/css/editcontent.css
@@ -13,14 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#editcontent-modal form {
-    margin: 0;
-}
-
-#editcontent-modal .modal-body label h4 {
-    margin-top: 0;
-}
-
 #editcontent-modal #editcontent-name,
 #editcontent-modal #editcontent-link,
 #editcontent-modal #editcontent-description {
diff --git a/node_modules/oae-core/editcontent/editcontent.html b/node_modules/oae-core/editcontent/editcontent.html
index 982bc193ad4..60fe1337f3a 100644
--- a/node_modules/oae-core/editcontent/editcontent.html
+++ b/node_modules/oae-core/editcontent/editcontent.html
@@ -2,40 +2,38 @@
 <link rel="stylesheet" type="text/css" href="css/editcontent.css" />
 
 <!-- MODAL -->
-<div id="editcontent-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="editcontent-modal-title" aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
-        <h3 id="editcontent-modal-title">__MSG__EDIT_DETAILS__</h3>
-    </div>
-    <form id="editcontent-form">
-        <div class="modal-body"><!-- --></div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
-            <button type="submit" class="btn btn-primary pull-right" disabled="true">__MSG__SAVE__</button>
+<div id="editcontent-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="editcontent-modal-title" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
+                <h3 id="editcontent-modal-title">__MSG__EDIT_DETAILS__</h3>
+            </div>
+            <form id="editcontent-form" role="form">
+                <div class="modal-body"><!-- --></div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
+                    <button type="submit" class="btn btn-primary pull-right">__MSG__SAVE__</button>
+                </div>
+            </form>
         </div>
-    </form>
+    </div>
 </div>
 
 <div id="editcontent-template"><!--
-    <div class="control-group">
-        <label for="editcontent-name"><h4>__MSG__TITLE__</h4></label>
-        <div class="controls">
-            <input type="text" id="editcontent-name" class="required maxlength-short" name="editcontent-name" placeholder="__MSG__ENTER_A_NAME__" value="${content.displayName|encodeForHTMLAttribute}"/>
-        </div>
+    <div class="form-group">
+        <label for="editcontent-name" class="control-label"><h4>__MSG__TITLE__</h4></label>
+        <input type="text" id="editcontent-name" class="form-control required maxlength-short" name="editcontent-name" placeholder="__MSG__ENTER_A_NAME__" value="${content.displayName|encodeForHTMLAttribute}"/>
     </div>
     {if content.resourceSubType === 'link'}
-        <div class="control-group">
-            <label for="editcontent-link"><h4>__MSG__LINK__</h4></label>
-            <div class="controls">
-                <input type="text" id="editcontent-link" class="url required prependhttp maxlength-short" name="editcontent-link" placeholder="__MSG__ENTER_A_LINK__" value="${content.link|encodeForHTMLAttribute}"/>
-            </div>
+        <div class="form-group">
+            <label for="editcontent-link" class="control-label"><h4>__MSG__LINK__</h4></label>
+            <input type="text" id="editcontent-link" class="form-control url required prependhttp maxlength-short" name="editcontent-link" placeholder="__MSG__ENTER_A_LINK__" value="${content.link|encodeForHTMLAttribute}"/>
         </div>
     {/if}
-    <div class="control-group">
-        <label for="editcontent-description"><h4>__MSG__DESCRIPTION__</h4></label>
-        <div class="controls">
-            <textarea id="editcontent-description" name="editcontent-description" placeholder="__MSG__ENTER_A_DESCRIPTION__" class="maxlength-medium">${content.description|encodeForHTML}</textarea>
-        </div>
+    <div class="form-group">
+        <label for="editcontent-description" class="control-label"><h4>__MSG__DESCRIPTION__</h4></label>
+        <textarea id="editcontent-description" name="editcontent-description" placeholder="__MSG__ENTER_A_DESCRIPTION__" class="form-control maxlength-medium">${content.description|encodeForHTML}</textarea>
     </div>
 --></div>
 
diff --git a/node_modules/oae-core/editcontent/js/editcontent.js b/node_modules/oae-core/editcontent/js/editcontent.js
index b86bce21e1f..a6d918d0fe1 100644
--- a/node_modules/oae-core/editcontent/js/editcontent.js
+++ b/node_modules/oae-core/editcontent/js/editcontent.js
@@ -27,7 +27,7 @@ define(['jquery', 'oae.core'], function ($, oae) {
          * Resets the widget to its original state when the modal dialog is closed
          */
         var setUpReset = function() {
-            $('#editcontent-modal', $rootel).on('hidden', function (evt) {
+            $('#editcontent-modal', $rootel).on('hidden.bs.modal', function (evt) {
                 // Reset the form
                 var $form = $('#editcontent-form', $rootel);
                 $form[0].reset();
@@ -117,7 +117,7 @@ define(['jquery', 'oae.core'], function ($, oae) {
                 $('#editcontent-form button[type="submit"]', $rootel).prop('disabled', false);
             });
 
-            $('#editcontent-modal', $rootel).on('shown', function() {
+            $('#editcontent-modal', $rootel).on('shown.bs.modal', function() {
                 // Set focus to the content name field
                 $('#editcontent-name', $rootel).focus();
             });
diff --git a/node_modules/oae-core/editdiscussion/css/editdiscussion.css b/node_modules/oae-core/editdiscussion/css/editdiscussion.css
index 7c918ef9359..3aa9b978c6a 100644
--- a/node_modules/oae-core/editdiscussion/css/editdiscussion.css
+++ b/node_modules/oae-core/editdiscussion/css/editdiscussion.css
@@ -13,14 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#editdiscussion-modal form {
-    margin: 0;
-}
-
-#editdiscussion-modal .modal-body label h4 {
-    margin-top: 0;
-}
-
 #editdiscussion-modal #editdiscussion-name,
 #editdiscussion-modal #editdiscussion-topic {
     width: 100%;
diff --git a/node_modules/oae-core/editdiscussion/editdiscussion.html b/node_modules/oae-core/editdiscussion/editdiscussion.html
index 89f5c0caeed..7a15987184f 100644
--- a/node_modules/oae-core/editdiscussion/editdiscussion.html
+++ b/node_modules/oae-core/editdiscussion/editdiscussion.html
@@ -2,32 +2,32 @@
 <link rel="stylesheet" type="text/css" href="css/editdiscussion.css" />
 
 <!-- MODAL -->
-<div id="editdiscussion-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="editdiscussion-modal-title" aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
-        <h3 id="editdiscussion-modal-title">__MSG__EDIT_DETAILS__</h3>
-    </div>
-    <form id="editdiscussion-form">
-        <div class="modal-body"><!-- --></div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
-            <button type="submit" class="btn btn-primary pull-right" disabled="true">__MSG__SAVE__</button>
+<div id="editdiscussion-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="editdiscussion-modal-title" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
+                <h3 id="editdiscussion-modal-title">__MSG__EDIT_DETAILS__</h3>
+            </div>
+            <form id="editdiscussion-form">
+                <div class="modal-body"><!-- --></div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
+                    <button type="submit" class="btn btn-primary pull-right" disabled="true">__MSG__SAVE__</button>
+                </div>
+            </form>
         </div>
-    </form>
+    </div>
 </div>
 
 <div id="editdiscussion-template"><!--
-    <div class="control-group">
-        <label for="editdiscussion-name"><h4>__MSG__DISCUSSION_NAME__</h4></label>
-        <div class="controls">
-            <input type="text" id="editdiscussion-name" class="required maxlength-short" name="editdiscussion-name" placeholder="__MSG__WHAT_WOULD_YOU_LIKE_TO_CALL_YOUR_DISCUSSION__" value="${discussion.displayName|encodeForHTMLAttribute}"/>
-        </div>
+    <div class="form-group">
+        <label for="editdiscussion-name" class="control-label"><h4>__MSG__DISCUSSION_NAME__</h4></label>
+        <input type="text" id="editdiscussion-name" class="form-control required maxlength-short" name="editdiscussion-name" placeholder="__MSG__WHAT_WOULD_YOU_LIKE_TO_CALL_YOUR_DISCUSSION__" value="${discussion.displayName|encodeForHTMLAttribute}"/>
     </div>
-    <div class="control-group">
-        <label for="editdiscussion-topic"><h4>__MSG__DISCUSSION_TOPIC__</h4></label>
-        <div class="controls">
-            <textarea id="editdiscussion-topic" class="required maxlength-medium" name="editdiscussion-topic" placeholder="__MSG__WHAT_WOULD_YOU_LIKE_TO_DISCUSS__">${discussion.description|encodeForHTML}</textarea>
-        </div>
+    <div class="form-group">
+        <label for="editdiscussion-topic" class="control-label"><h4>__MSG__DISCUSSION_TOPIC__</h4></label>
+        <textarea id="editdiscussion-topic" class="form-control required maxlength-medium" name="editdiscussion-topic" placeholder="__MSG__WHAT_WOULD_YOU_LIKE_TO_DISCUSS__">${discussion.description|encodeForHTML}</textarea>
     </div>
 --></div>
 
diff --git a/node_modules/oae-core/editdiscussion/js/editdiscussion.js b/node_modules/oae-core/editdiscussion/js/editdiscussion.js
index 5b8bf297705..8f81c0ce28e 100644
--- a/node_modules/oae-core/editdiscussion/js/editdiscussion.js
+++ b/node_modules/oae-core/editdiscussion/js/editdiscussion.js
@@ -27,7 +27,7 @@ define(['jquery', 'oae.core'], function ($, oae) {
          * Resets the widget to its original state when the modal dialog is closed
          */
         var setUpReset = function() {
-            $('#editdiscussion-modal', $rootel).on('hidden', function() {
+            $('#editdiscussion-modal', $rootel).on('hidden.bs.modal', function() {
                 // Reset the form
                 var $form = $('#editdiscussion-form', $rootel);
                 $form[0].reset();
@@ -111,7 +111,7 @@ define(['jquery', 'oae.core'], function ($, oae) {
                 $('#editdiscussion-form button[type="submit"]', $rootel).prop('disabled', false);
             });
 
-            $('#editdiscussion-modal', $rootel).on('shown', function() {
+            $('#editdiscussion-modal', $rootel).on('shown.bs.modal', function() {
                 // Set focus to the discussion topic field
                 $('#editdiscussion-name', $rootel).focus();
             });
diff --git a/node_modules/oae-core/editgroup/css/editgroup.css b/node_modules/oae-core/editgroup/css/editgroup.css
index c885566b6d3..742f27b07c3 100644
--- a/node_modules/oae-core/editgroup/css/editgroup.css
+++ b/node_modules/oae-core/editgroup/css/editgroup.css
@@ -14,22 +14,5 @@
  */
 
 #editgroup-modal .modal-body {
-    max-height: 420px;
-}
-
-#editgroup-modal #editgroup-name,
-#editgroup-modal #editgroup-description {
-    width: 100%;
-}
-
-#editgroup-modal form {
-    margin: 0;
-}
-
-/* Large options override.
-   TODO: Remove this once the large options component no longer bind to a fixed width option.
-   https://github.com/oaeproject/3akai-ux/issues/2980 */
-
-#editgroup-modal #editgroup-joinable-container .oae-large-options-container .oae-large-options.checked + i {
-    margin-left: 107px;
+    padding: 5px 25px 0;
 }
diff --git a/node_modules/oae-core/editgroup/editgroup.html b/node_modules/oae-core/editgroup/editgroup.html
index b6b72082281..e3707aee082 100644
--- a/node_modules/oae-core/editgroup/editgroup.html
+++ b/node_modules/oae-core/editgroup/editgroup.html
@@ -2,59 +2,64 @@
 <link rel="stylesheet" type="text/css" href="css/editgroup.css" />
 
 <!-- MODAL -->
-<div id="editgroup-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="editgroup-modal-title" aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
-        <h3 id="editgroup-modal-title">__MSG__EDIT_DETAILS__</h3>
-    </div>
-    <form id="editgroup-form">
-        <div class="modal-body">
-            <div id="editgroup-metadata-container"><!-- --></div>
-            <div id="editgroup-joinable-container"><!-- --></div>
-        </div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
-            <button type="submit" class="btn btn-primary pull-right" disabled="true">__MSG__SAVE__</button>
+<div id="editgroup-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="editgroup-modal-title" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
+                <h3 id="editgroup-modal-title">__MSG__EDIT_DETAILS__</h3>
+            </div>
+            <form id="editgroup-form" role="form">
+                <div class="modal-body">
+                    <div id="editgroup-metadata-container" class="form-group"><!-- --></div>
+                    <div id="editgroup-joinable-container" class="form-group"><!-- --></div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
+                    <button type="submit" class="btn btn-primary pull-right" disabled="true">__MSG__SAVE__</button>
+                </div>
+            </form>
         </div>
-    </form>
+    </div>
 </div>
 
 <div id="editgroup-metadata-template"><!--
-    <div class="control-group">
-        <label for="editgroup-name"><h4>__MSG__GROUP_NAME__</h4></label>
-        <div class="controls">
-            <input type="text" id="editgroup-name" class="required maxlength-short" placeholder="__MSG__WHAT_DO_YOU_WANT_TO_CALL_YOUR_GROUP__" value="${group.displayName|encodeForHTMLAttribute}"/>
-        </div>
+    <div class="form-group">
+        <label for="editgroup-name" class="control-label"><h4>__MSG__GROUP_NAME__</h4></label>
+        <input type="text" id="editgroup-name" class="form-control required maxlength-short" placeholder="__MSG__WHAT_DO_YOU_WANT_TO_CALL_YOUR_GROUP__" value="${group.displayName|encodeForHTMLAttribute}"/>
     </div>
-    <div class="control-group">
-        <label for="editgroup-description"><h4>__MSG__GROUP_DESCRIPTION__</h4></label>
-        <div class="controls">
-            <textarea id="editgroup-description" class="maxlength-medium" name="editgroup-description" placeholder="__MSG__ENTER_A_GROUP_DESCRIPTION__">${group.description|encodeForHTML}</textarea>
-        </div>
+    <div class="form-group">
+        <label for="editgroup-description" class="control-label"><h4>__MSG__GROUP_DESCRIPTION__</h4></label>
+        <textarea id="editgroup-description" class="form-control maxlength-medium" name="editgroup-description" placeholder="__MSG__ENTER_A_GROUP_DESCRIPTION__" rows="3">${group.description|encodeForHTML}</textarea>
     </div>
 --></div>
 
 <div id="editgroup-joinable-template"><!--
     <h4>__MSG__JOIN_OPTIONS__</h4>
-    <div class="oae-large-options-container row-fluid">
-        <label for="oae-joinable-no" class="span6 text-center">
-            <div class="oae-large-options well pull-left text-center {if joinable === 'no'} checked{/if}">
-                <input type="radio" id="oae-joinable-no" value="no" name="oae-joinable-group" class="pull-left" {if joinable === 'no'} checked="checked"{/if} tabindex="0"/>
-                <i class="icon-ban-circle large text-center {if joinable === 'no'} selected{/if}"></i>
-                <span>__MSG__ONLY_MANAGERS_CAN_ADD_MEMBERS__</span>
-            </div>
-            <i class="icon-ok hide"></i>
-            <small>__MSG__GROUP_JOINABLE_MANAGERS_ADD_DESCRIPTION__</small>
-        </label>
-        <label for="oae-joinable-yes" class="span6 text-center">
-            <div class="oae-large-options well pull-left text-center {if joinable === 'yes'} checked{/if}">
-                <input type="radio" id="oae-joinable-yes" value="yes" name="oae-joinable-group" class="pull-left" {if joinable === 'yes'} checked="checked"{/if} tabindex="0"/>
-                <i class="icon-star large text-center {if joinable === 'yes'} selected{/if}"></i>
-                <span>__MSG__ANYONE_CAN_JOIN__</span>
-            </div>
-            <i class="icon-ok hide"></i>
-            <small>__MSG__GROUP_JOINABLE_ANYONE_DESCRIPTION__</small>
-        </label>
+
+    <div class="row oae-large-options-container">
+        <div class="col-md-6 text-center">
+            <label for="oae-joinable-no" class="{if joinable === 'no'}checked{/if}">
+                <i class="icon-ok hide"></i>
+                <div class="oae-large-options well">
+                    <input type="radio" id="oae-joinable-no" value="no" name="oae-joinable-group" class="pull-left" tabindex="0"/>
+                    <i class="icon-ban-circle large text-center {if joinable === 'no'} selected{/if}"></i>
+                    <span class="oae-threedots">__MSG__ONLY_MANAGERS_CAN_ADD_MEMBERS__</span>
+                </div>
+                <small>__MSG__GROUP_JOINABLE_MANAGERS_ADD_DESCRIPTION__</small>
+            </label>
+        </div>
+        <div class="col-md-6 text-center">
+            <label for="oae-joinable-yes" class="{if joinable === 'yes'}checked{/if}">
+                <i class="icon-ok hide"></i>
+                <div class="oae-large-options well">
+                    <input type="radio" id="oae-joinable-yes" value="yes" name="oae-joinable-group" class="pull-left" tabindex="0"/>
+                    <i class="icon-star large text-center {if joinable === 'yes'} selected{/if}"></i>
+                    <span class="oae-threedots">__MSG__ANYONE_CAN_JOIN__</span>
+                </div>
+                <small>__MSG__GROUP_JOINABLE_ANYONE_DESCRIPTION__</small>
+            </label>
+        </div>
     </div>
 --></div>
 
diff --git a/node_modules/oae-core/editgroup/js/editgroup.js b/node_modules/oae-core/editgroup/js/editgroup.js
index ee59db59224..d8ee808db58 100644
--- a/node_modules/oae-core/editgroup/js/editgroup.js
+++ b/node_modules/oae-core/editgroup/js/editgroup.js
@@ -33,10 +33,10 @@ define(['jquery', 'oae.core'], function($, oae) {
             }, $('#editgroup-joinable-container', $rootel));
 
             $rootel.on('change', '.oae-large-options-container input[type="radio"]', function() {
-                $('.oae-large-options', $rootel).removeClass('checked');
+                $('.oae-large-options-container label', $rootel).removeClass('checked');
                 $('.oae-large-options i', $rootel).removeClass('selected');
-                $(this).parents('.oae-large-options').addClass('checked');
-                $(this).parents('.oae-large-options').find('i').addClass('selected');
+                $(this).parents('label').addClass('checked');
+                $(this).parents('label').find('.oae-large-options i').addClass('selected');
             });
         };
 
@@ -90,7 +90,7 @@ define(['jquery', 'oae.core'], function($, oae) {
          * Resets the widget to its original state when the modal dialog is closed
          */
         var setUpReset = function() {
-            $('#editgroup-modal').on('hidden', function() {
+            $('#editgroup-modal').on('hidden.bs.modal', function() {
                 // Reset the form
                 var $form = $('#editgroup-form', $rootel);
                 $form[0].reset();
@@ -122,7 +122,7 @@ define(['jquery', 'oae.core'], function($, oae) {
                 $('#editgroup-form button[type="submit"]', $rootel).prop('disabled', false);
             });
 
-            $('#editgroup-modal', $rootel).on('shown', function () {
+            $('#editgroup-modal', $rootel).on('shown.bs.modal', function () {
                 // Set focus to the group name field
                 $('#editgroup-name', $rootel).focus();
             });
diff --git a/node_modules/oae-core/editprofile/css/editprofile.css b/node_modules/oae-core/editprofile/css/editprofile.css
index f300966e75d..c67671f2e54 100644
--- a/node_modules/oae-core/editprofile/css/editprofile.css
+++ b/node_modules/oae-core/editprofile/css/editprofile.css
@@ -12,15 +12,3 @@
  * or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-
-#editprofile-modal form {
-    margin: 0;
-}
-
-#editprofile-modal .modal-body label h4 {
-    margin-top: 0;
-}
-
-#editprofile-modal input[type="text"] {
-    width: 100%;
-}
diff --git a/node_modules/oae-core/editprofile/editprofile.html b/node_modules/oae-core/editprofile/editprofile.html
index 85dfba0c59a..52b6cef71dc 100644
--- a/node_modules/oae-core/editprofile/editprofile.html
+++ b/node_modules/oae-core/editprofile/editprofile.html
@@ -2,63 +2,69 @@
 <link rel="stylesheet" type="text/css" href="css/editprofile.css" />
 
 <!-- MODAL -->
-<div id="editprofile-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="editprofile-modal-title" aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
-        <h3 id="editprofile-modal-title">__MSG__EDIT_DETAILS__</h3>
-    </div>
-    <form id="editprofile-form">
-        <div class="modal-body"><!-- --></div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
-            <button type="submit" class="btn btn-primary pull-right" disabled="true">__MSG__SAVE__</button>
+<div id="editprofile-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="editprofile-modal-title" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
+                <h3 id="editprofile-modal-title">__MSG__EDIT_DETAILS__</h3>
+            </div>
+            <form id="editprofile-form" role="form">
+                <div class="modal-body"><!-- --></div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
+                    <button type="submit" class="btn btn-primary pull-right" disabled="true">__MSG__SAVE__</button>
+                </div>
+            </form>
         </div>
-    </form>
+    </div>
 </div>
 
 <div id="editprofile-template"><!--
-    <div class="control-group">
-        <label for="editprofile-name"><h4>__MSG__NAME__</h4></label>
-        <div class="controls">
-            <input type="text" id="editprofile-name" class="required maxlength-short" name="editprofile-name" placeholder="__MSG__ENTER_A_NAME__" value="${oae.data.me.displayName|encodeForHTMLAttribute}"/>
-        </div>
+    <div class="form-group">
+        <label for="editprofile-name" class="control-label"><h4>__MSG__NAME__</h4></label>
+        <input type="text" id="editprofile-name" class="form-control required maxlength-short" name="editprofile-name" placeholder="__MSG__ENTER_A_NAME__" value="${oae.data.me.displayName|encodeForHTMLAttribute}"/>
     </div>
-    <div class="control-group">
-        <label for="editprofile-email"><h4>__MSG__EMAIL__</h4></label>
-        <div class="controls">
-            <input type="text" id="editprofile-email" class="required email maxlength-short" name="editprofile-email" placeholder="__MSG__ENTER_AN_EMAIL_ADDRESS__" value="${oae.data.me.email|encodeForHTMLAttribute}"/>
-        </div>
+    <div class="form-group">
+        <label for="editprofile-email" class="control-label"><h4>__MSG__EMAIL__</h4></label>
+        <input type="text" id="editprofile-email" class="form-control required email maxlength-short" name="editprofile-email" placeholder="__MSG__ENTER_AN_EMAIL_ADDRESS__" value="${oae.data.me.email|encodeForHTMLAttribute}"/>
     </div>
     <h4>__MSG__PROFILE_VISIBILITY__</h4>
     {var tenant = oae.api.util.security().encodeForHTML(oae.data.me.tenant.displayName)}
-    <div class="oae-large-options-container row-fluid">
-        <label for="oae-visibility-private" class="span4 text-center">
-            <div class="oae-large-options well pull-left text-center {if oae.data.me.visibility === 'private'} checked{/if}">
-                <input type="radio" id="oae-visibility-private" value="private" name="oae-visibility-group" class="pull-left" {if oae.data.me.visibility === 'private'} checked="checked"{/if} tabindex="0"/>
-                <i class="icon-oae-private large text-center"></i>
-                <span>__MSG__PRIVATE__</span>
-            </div>
-            <i class="icon-ok hide"></i>
-            <small>__MSG__PROFILE_PRIVATE_DESCRIPTION__</small>
-        </label>
-        <label for="oae-visibility-loggedin" class="span4 text-center">
-            <div class="oae-large-options well pull-left text-center {if oae.data.me.visibility === 'loggedin'} checked{/if}">
-                <input type="radio" id="oae-visibility-loggedin" value="loggedin" name="oae-visibility-group" class="pull-left" {if oae.data.me.visibility === 'loggedin'} checked="checked"{/if} tabindex="0"/>
-                <i class="icon-oae-loggedin large text-center"></i>
-                <span>${tenant}</span>
-            </div>
-            <i class="icon-ok hide"></i>
-            <small>__MSG__PROFILE_LOGGEDIN_DESCRIPTION__</small>
-        </label>
-        <label for="oae-visibility-public" class="span4 text-center">
-            <div class="oae-large-options well pull-left text-center {if oae.data.me.visibility === 'public'} checked{/if}">
-                <input type="radio" id="oae-visibility-public" value="public" name="oae-visibility-group" class="pull-left" {if oae.data.me.visibility === 'public'} checked="checked"{/if} tabindex="0"/>
-                <i class="icon-oae-public large text-center"></i>
-                <span>__MSG__PUBLIC__</span>
-            </div>
-            <i class="icon-ok hide"></i>
-            <small>__MSG__PROFILE_PUBLIC_DESCRIPTION__</small>
-        </label>
+    <div class="oae-large-options-container row">
+        <div class="col-md-4 text-center">
+            <label for="oae-visibility-private" class="{if oae.data.me.visibility === 'private'} checked{/if}">
+                <i class="icon-ok hide"></i>
+                <div class="oae-large-options well">
+                    <input type="radio" id="oae-visibility-private" value="private" name="oae-visibility-group" class="pull-left" {if oae.data.me.visibility === 'private'} checked="checked"{/if} tabindex="0"/>
+                    <i class="icon-oae-private large text-center"></i>
+                    <span class="oae-threedots">__MSG__PRIVATE__</span>
+                </div>
+                <small>__MSG__PROFILE_PRIVATE_DESCRIPTION__</small>
+            </label>
+        </div>
+        <div class="col-md-4 text-center">
+            <label for="oae-visibility-loggedin" class="{if oae.data.me.visibility === 'loggedin'} checked{/if}">
+                <i class="icon-ok hide"></i>
+                <div class="oae-large-options well">
+                    <input type="radio" id="oae-visibility-loggedin" value="loggedin" name="oae-visibility-group" class="pull-left" {if oae.data.me.visibility === 'loggedin'} checked="checked"{/if} tabindex="0"/>
+                    <i class="icon-oae-loggedin large text-center"></i>
+                    <span class="oae-threedots">${tenant}</span>
+                </div>
+                <small>__MSG__PROFILE_LOGGEDIN_DESCRIPTION__</small>
+            </label>
+        </div>
+        <div class="col-md-4 text-center">
+            <label for="oae-visibility-public" class="{if oae.data.me.visibility === 'public'} checked{/if}">
+                <i class="icon-ok hide"></i>
+                <div class="oae-large-options well">
+                    <input type="radio" id="oae-visibility-public" value="public" name="oae-visibility-group" class="pull-left" {if oae.data.me.visibility === 'public'} checked="checked"{/if} tabindex="0"/>
+                    <i class="icon-oae-public large text-center"></i>
+                    <span class="oae-threedots">__MSG__PUBLIC__</span>
+                </div>
+                <small>__MSG__PROFILE_PUBLIC_DESCRIPTION__</small>
+            </label>
+        </div>
     </div>
 --></div>
 
diff --git a/node_modules/oae-core/editprofile/js/editprofile.js b/node_modules/oae-core/editprofile/js/editprofile.js
index c0f385e11a3..1db51d5c7a5 100644
--- a/node_modules/oae-core/editprofile/js/editprofile.js
+++ b/node_modules/oae-core/editprofile/js/editprofile.js
@@ -78,7 +78,7 @@ define(['jquery', 'oae.core'], function ($, oae) {
          * Resets the widget to its original state when the modal dialog is closed
          */
         var setUpReset = function() {
-            $('#editprofile-modal', $rootel).on('hidden', function (evt) {
+            $('#editprofile-modal', $rootel).on('hidden.bs.modal', function (evt) {
                 // Reset the form
                 var $form = $('#editprofile-form', $rootel);
                 $form[0].reset();
@@ -102,8 +102,8 @@ define(['jquery', 'oae.core'], function ($, oae) {
 
             // Catch changes in the visibility radio group
             $rootel.on('change', '.oae-large-options-container input[type="radio"]', function() {
-                $('.oae-large-options', $rootel).removeClass('checked');
-                $(this).parents('.oae-large-options').addClass('checked');
+                $('.oae-large-options-container label', $rootel).removeClass('checked');
+                $(this).parents('label').addClass('checked');
             });
 
             // Detect changes in the form and enable the submit button
@@ -111,7 +111,7 @@ define(['jquery', 'oae.core'], function ($, oae) {
                 $('#editprofile-form button[type="submit"]', $rootel).prop('disabled', false);
             });
 
-            $('#editprofile-modal', $rootel).on('shown', function() {
+            $('#editprofile-modal', $rootel).on('shown.bs.modal', function() {
                 // Set focus to the display name field
                 $('#editprofile-name', $rootel).focus();
             });
diff --git a/node_modules/oae-core/etherpad/css/etherpad.css b/node_modules/oae-core/etherpad/css/etherpad.css
index ff1cd27f8e4..4cebffec013 100644
--- a/node_modules/oae-core/etherpad/css/etherpad.css
+++ b/node_modules/oae-core/etherpad/css/etherpad.css
@@ -14,7 +14,7 @@
  */
 
 #etherpad-container #etherpad-view-mode {
-    margin: 80px 65px 40px 50px;
+    margin: 30px 0;
 }
 
 #etherpad-container #etherpad-view-mode ul.indent li {
@@ -27,7 +27,7 @@
  * to the top of the page
  */
 #etherpad-container #etherpad-edit-mode {
-    padding: 20px 10px 30px;
+    padding: 20px 0 40px;
     min-height: 500px;
 }
 
diff --git a/node_modules/oae-core/filepreview/css/filepreview.css b/node_modules/oae-core/filepreview/css/filepreview.css
index 6250f29a38f..dbdba265cd2 100755
--- a/node_modules/oae-core/filepreview/css/filepreview.css
+++ b/node_modules/oae-core/filepreview/css/filepreview.css
@@ -42,28 +42,53 @@
 #filepreview-container #filepreview-image-container {
     line-height: 250px;
     min-height: 300px;
-    padding: 30px 60px 40px;
+    padding: 20px 0 40px;
 }
 
 #filepreview-container #filepreview-image-container img {
     max-height: 900px;
+    max-width: 100%;
     -webkit-box-shadow: 0 0 10px 0px rgba(0, 0, 0, 0.3);
        -moz-box-shadow: 0 0 10px 0px rgba(0, 0, 0, 0.3);
             box-shadow: 0 0 10px 0px rgba(0, 0, 0, 0.3);
 }
 
+/* iPhone resolution */
+@media only screen and (min-device-width : 320px) and (max-device-width : 480px) {
+    #filepreview-container #filepreview-image-container {
+        min-height: 150px;
+    }
+}
+
 /* MediaCore video preview */
 
-#filepreview-container #filepreview-markdown-container,
-#filepreview-container #filepreview-mediacore {
-    padding: 30px 65px 30px 50px;
+#filepreview-container #filepreview-mediacore,
+#filepreview-container #filepreview-markdown-container {
+    padding: 20px 0 40px;
 }
 
 #filepreview-container #filepreview-mediacore iframe {
-    height: 600px;
     width: 100%;
 }
 
+@media (min-width: 780px) {
+    #filepreview-container #filepreview-mediacore iframe {
+        height: 600px;
+    }
+}
+
+@media (min-width: 400px) and (max-width: 780px) {
+    #filepreview-container #filepreview-mediacore iframe {
+        height: 400px;
+    }
+}
+
+@media (max-width: 400px) {
+    #filepreview-container #filepreview-mediacore iframe {
+        height: 200px;
+    }
+}
+
 #filepreview-container #filepreview-markdown-container div {
     overflow-x: auto;
     word-wrap: break-word;
diff --git a/node_modules/oae-core/filepreview/filepreview.html b/node_modules/oae-core/filepreview/filepreview.html
index 730a847ade9..be0db084044 100755
--- a/node_modules/oae-core/filepreview/filepreview.html
+++ b/node_modules/oae-core/filepreview/filepreview.html
@@ -41,7 +41,9 @@
         {else}
             {var imageUrl = content.downloadPath}
         {/if}
-        <img src="${imageUrl}" alt="${content.displayName}" />
+        <div>
+            <img src="${imageUrl}" alt="${content.displayName}" />
+        </div>
     </div>
 --></div>
 
diff --git a/node_modules/oae-core/footer/css/footer.css b/node_modules/oae-core/footer/css/footer.css
index cf0365bdce9..6d5e209bab8 100644
--- a/node_modules/oae-core/footer/css/footer.css
+++ b/node_modules/oae-core/footer/css/footer.css
@@ -20,8 +20,7 @@
 }
 
 #footer-container .btn-link {
-    /* Default is middle. Baseline is required to align with other text. */
-    vertical-align: baseline;
+    vertical-align: baseline; /* Default is middle. Baseline is required to align with other text. */
 }
 
 #footer-container .oae-trigger-termsandconditions {
diff --git a/node_modules/oae-core/footer/footer.html b/node_modules/oae-core/footer/footer.html
index fb12ad59991..26b46f65cf5 100644
--- a/node_modules/oae-core/footer/footer.html
+++ b/node_modules/oae-core/footer/footer.html
@@ -2,15 +2,15 @@
 <link rel="stylesheet" type="text/css" href="css/footer.css" />
 
 <!-- CONTENT -->
-<div id="footer-container" class="text-center">
+<footer id="footer-container" class="text-center">
     <a href="http://apereo.org/" target="_blank" title="__MSG__COPYRIGHT__" class="oae-plain-link">
         __MSG__COPYRIGHT_SYMBOL__
-        __MSG__APEREO_FOUNDATION__ 
-        <span id="footer-date"></span>. 
+        __MSG__APEREO_FOUNDATION__
+        <span id="footer-date"></span>.
         __MSG__ALL_RIGHTS_RESERVED__
     </a>
     <button type="button" class="btn btn-link oae-trigger-termsandconditions hide">__MSG__TERMS_AND_CONDITIONS__</button>
-</div>
+</footer>
 
 <!-- JAVASCRIPT -->
 <script type="text/javascript" src="js/footer.js"></script>
diff --git a/node_modules/oae-core/leavegroup/css/leavegroup.css b/node_modules/oae-core/leavegroup/css/leavegroup.css
index 3945edae7c9..7d0dcbf25b5 100644
--- a/node_modules/oae-core/leavegroup/css/leavegroup.css
+++ b/node_modules/oae-core/leavegroup/css/leavegroup.css
@@ -23,8 +23,18 @@
     background-color: #FFF;
 }
 
-#leavegroup-modal ul.oae-list .oae-listitem h3 {
-    max-width: 400px;
+/* Add an IE9 fallback for threedots */
+.ie-lt10 #leavegroup-modal ul.oae-list .oae-listitem h3 {
+    max-width: 300px;
+}
+
+#leavegroup-modal .oae-listitem .oae-listitem-actions {
+    margin-left: 7px;
+    width: auto;
+}
+
+#leavegroup-modal ul.oae-list .oae-listitem .icon-warning-sign {
+    line-height: 1.5;
 }
 
 #leavegroup-modal .alert-danger {
diff --git a/node_modules/oae-core/leavegroup/leavegroup.html b/node_modules/oae-core/leavegroup/leavegroup.html
index deb69e9998a..c5716904ae5 100644
--- a/node_modules/oae-core/leavegroup/leavegroup.html
+++ b/node_modules/oae-core/leavegroup/leavegroup.html
@@ -2,12 +2,16 @@
 <link rel="stylesheet" type="text/css" href="css/leavegroup.css" />
 
 <!-- MODAL -->
-<div id="leavegroup-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="leavegroup-modal-title" aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
-        <h3 id="leavegroup-modal-title">__MSG__LEAVE_GROUP__</h3>
+<div id="leavegroup-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="leavegroup-modal-title" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
+                <h3 id="leavegroup-modal-title">__MSG__LEAVE_GROUP__</h3>
+            </div>
+            <div id="leavegroup-modal-content"><!-- --></div>
+        </div>
     </div>
-    <div id="leavegroup-modal-content"></div>
 </div>
 
 <div id="leavegroup-list-template"><!--
@@ -26,21 +30,21 @@ <h4>
                     {var groupName = oae.api.util.security().encodeForHTML(group.displayName)}
                     <li class="oae-list-item" data-id="${group.id}">
                         <div class="oae-list-compact-item">
-                            <div class="oae-listitem oae-listitem-compact">
-                                <div class="oae-listitem-actions pull-right">
-                                    <i class="icon-spinner icon-spin">
-                                        <span class="oae-aural-text">__MSG__LEAVING_GROUP__</span>
-                                    </i>
-                                    <i class="icon-ok hide">
-                                        <span class="oae-aural-text">__MSG__GROUP_LEAVE_SUCCESS__</span>
-                                    </i>
-                                    <i class="icon-warning-sign hide">
-                                        <span class="oae-aural-text">__MSG__GROUP_LEAVE_FAILED__</span>
-                                    </i>
-                                </div>
+                            <div class="clearfix oae-listitem oae-listitem-compact">
                                 ${renderThumbnail(group)}
                                 <div>
                                     <h3 class="oae-threedots">${groupName}</h3>
+                                    <div class="oae-listitem-actions pull-right">
+                                        <i class="icon-spinner icon-spin">
+                                            <span class="oae-aural-text">__MSG__LEAVING_GROUP__</span>
+                                        </i>
+                                        <i class="icon-ok hide">
+                                            <span class="oae-aural-text">__MSG__GROUP_LEAVE_SUCCESS__</span>
+                                        </i>
+                                        <i class="icon-warning-sign hide">
+                                            <span class="oae-aural-text">__MSG__GROUP_LEAVE_FAILED__</span>
+                                        </i>
+                                    </div>
                                 </div>
                             </div>
                         </div>
diff --git a/node_modules/oae-core/lhnavigation/bundles/default.properties b/node_modules/oae-core/lhnavigation/bundles/default.properties
new file mode 100644
index 00000000000..58602afb80b
--- /dev/null
+++ b/node_modules/oae-core/lhnavigation/bundles/default.properties
@@ -0,0 +1,2 @@
+CLOSE_NAVIGATION = Close navigation
+OPEN_NAVIGATION = Open navigation
diff --git a/node_modules/oae-core/lhnavigation/bundles/nl_NL.properties b/node_modules/oae-core/lhnavigation/bundles/nl_NL.properties
new file mode 100644
index 00000000000..251b04b9de1
--- /dev/null
+++ b/node_modules/oae-core/lhnavigation/bundles/nl_NL.properties
@@ -0,0 +1,2 @@
+CLOSE_NAVIGATION = Sluit navigatie
+OPEN_NAVIGATION = Open navigatie
diff --git a/node_modules/oae-core/lhnavigation/css/lhnavigation.css b/node_modules/oae-core/lhnavigation/css/lhnavigation.css
index 1e85c60b096..3d8390464d5 100755
--- a/node_modules/oae-core/lhnavigation/css/lhnavigation.css
+++ b/node_modules/oae-core/lhnavigation/css/lhnavigation.css
@@ -16,16 +16,3 @@
 #lhnavigation-container {
     padding: 5px 10px;
 }
-
-#lhnavigation-page {
-    padding: 5px 75px 50px 0px;
-}
-
-@media screen and (max-width: 1200px) {
-    #lhnavigation-container.row-fluid .span2 {
-        width: 23.4043%;
-    }
-    #lhnavigation-container.row-fluid .span10 {
-        width: 74.4681%;
-    }
-}
diff --git a/node_modules/oae-core/lhnavigation/js/lhnavigation.js b/node_modules/oae-core/lhnavigation/js/lhnavigation.js
index a1aa4f434b3..856dd4eec2f 100755
--- a/node_modules/oae-core/lhnavigation/js/lhnavigation.js
+++ b/node_modules/oae-core/lhnavigation/js/lhnavigation.js
@@ -20,7 +20,7 @@ define(['jquery', 'oae.core', 'jquery.history'], function($, oae) {
         var $rootel = $('#' + uid);
 
         // Variable that will be used to keep track of the provided page structure
-        var lhNavigationStructure = null;
+        var lhNavigationPages = null;
 
         /**
          * Render a newly selected page. We first deselect the previously selected page, and then put an active
@@ -29,25 +29,28 @@ define(['jquery', 'oae.core', 'jquery.history'], function($, oae) {
          */
         var renderPage = function() {
             // Remove the active indicator on the previously selected page
-            $('#lhnavigation-navigation ul li', $rootel).removeClass('active');
+            $('.oae-lhnavigation ul li', $rootel).removeClass('active');
 
             // Get the current page from the History.js state and select it.
             var selectedPage = getPage(History.getState().data.page);
             // Mark the selected page as active in the left hand navigation
-            $('#lhnavigation-navigation ul li[data-id="' + selectedPage.id + '"]', $rootel).addClass('active');
+            $('.oae-lhnavigation ul li[data-id="' + selectedPage.id + '"]', $rootel).addClass('active');
 
             // Hide the current open page
-            $('#lhnavigation-page > div', $rootel).hide();
+            $('.oae-page > div', $rootel).hide();
 
             // Render the page's content. We first check if the page has been rendered before. If that's
             // the case, we just show it again. Otherwise, we render the page structure first and render
             // all of the widgets
-            var $pageContainer = $('#lhnavigation-page', $rootel);
+            var $pageContainer = $('.oae-page', $rootel);
             var $cachedPage = $('div[data-id="' + selectedPage.id + '"]', $pageContainer);
             if ($cachedPage.length > 0) {
                 $cachedPage.show();
             } else {
-                $pageContainer.append(oae.api.util.template().render($('#lhnavigation-page-template'), selectedPage));
+                $pageContainer.append(oae.api.util.template().render($('#lhnavigation-page-template'), {
+                    'selectedPage': selectedPage
+                }));
+
                 // Collect the widget data into a format that is understood by the widget loader
                 var widgetData = {};
                 $.each(selectedPage.layout, function(columnIndex, column) {
@@ -57,6 +60,7 @@ define(['jquery', 'oae.core', 'jquery.history'], function($, oae) {
                         }
                     });
                 });
+
                 // Render the widgets and pass in the widget data
                 oae.api.widget.loadWidgets($pageContainer, false, widgetData);
             }
@@ -69,27 +73,36 @@ define(['jquery', 'oae.core', 'jquery.history'], function($, oae) {
          * @return {Object}                 Object representing the page with the provided page id. If no page with the provided page id can be found, the first page will be returned
          */
         var getPage = function(pageId) {
-            for (var i = 0; i < lhNavigationStructure.length; i++) {
-                if (lhNavigationStructure[i].id === pageId) {
-                    return lhNavigationStructure[i];
+            for (var i = 0; i < lhNavigationPages.length; i++) {
+                if (lhNavigationPages[i].id === pageId) {
+                    return lhNavigationPages[i];
                 }
             }
             // Return the first page if no page with the provided id can be found
-            return lhNavigationStructure[0];
+            return lhNavigationPages[0];
         };
 
         /**
          * Render the left hand navigation based on the structure that has been passed in
          * and start listening to click events for the different elements in there.
          *
-         * @param  {String}     baseUrl         The current page's base URL. The different page ids will be appended to this to generate the full URL of each page
+         * @param  {Object[]}    lhNavPages        The page navigation structure
+         * @param  {Object[]}    [lhNavActions]    The action buttons structure
+         * @param  {String}      [baseUrl]         The current page's base URL. The different page ids will be appended to this to generate the full URL of each page
          */
-        var setUpNavigation = function(baseUrl) {
+        var setUpNavigation = function(lhNavPages, lhNavActions, baseUrl) {
             // Render the navigation
-            oae.api.util.template().render($('#lhnavigation-navigation-template'), {
-                'items': lhNavigationStructure,
+            var renderedNavigation = oae.api.util.template().render($('#lhnavigation-navigation-template', $rootel), {
+                'lhNavPages': lhNavPages,
+                'lhNavActions': lhNavActions,
                 'baseUrl': baseUrl
-            }, $('#lhnavigation-navigation'));
+            });
+            $('.oae-lhnavigation > ul.nav', $rootel).html(renderedNavigation);
+
+            // Render clip actions first
+            if (lhNavActions && lhNavActions.length) {
+                setUpNavigationActions();
+            }
 
             // Extract the currently selected page from the URL by parsing the URL fragment that's
             // inside of the current History.js hash. The expected URL structure is `/me/<pageId>[?q=foo]`.
@@ -128,7 +141,7 @@ define(['jquery', 'oae.core', 'jquery.history'], function($, oae) {
             History.replaceState(data, title, url);
 
             // Bind the click event
-            $rootel.on('click', '#lhnavigation-navigation ul li', function(ev) {
+            $rootel.on('click', '.oae-lhnavigation ul li[data-id]', function(ev) {
                 // Only push state when a link other than the active one has been clicked
                 if (!$(this).hasClass('active')) {
                     var page = getPage($(this).attr('data-id'));
@@ -142,6 +155,20 @@ define(['jquery', 'oae.core', 'jquery.history'], function($, oae) {
             });
         };
 
+        /**
+         * Bind the navigation actions
+         */
+        var setUpNavigationActions = function() {
+            // Set up the collapsable menu items
+            $rootel.on('click', '.oae-lhnavigation > ul > li > button', function(ev) {
+                $(this).next('.lhnavigation-collapsed').toggle({
+                    'duration': 250,
+                    'easing': 'linear'
+                });
+                $(this).find('.lhnavigation-caret-container i').toggle();
+            });
+        };
+
         /**
          * The statechange event will be triggered every time the browser back or forward button
          * is pressed or state is pushed/replaced using History.js.
@@ -149,15 +176,77 @@ define(['jquery', 'oae.core', 'jquery.history'], function($, oae) {
         $(window).on('statechange', renderPage);
 
         /**
-         * Mechanism used for widgets to pass in a page structure. We register a trigger event
+         * Mechanism used for widgets to pass in a navigation structure. We register a trigger event
          * that can be used by widgets to send out the pages that need to be rendered. In case
          * this widget isn't ready at the time when the supplying widget sends out its request,
          * we also send out a ready event, which allows for the supplying widget to resend its
          * data.
+         *
+         * A left hand navigation contains 2 different sections. The first section is a list of action buttons that replace clips when the viewport width is too small to render them.
+         * These actions can also be grouped into collapsible sections. An example array required to initiate these action buttons is the following:
+         *
+         * [{
+         *     'icon': 'icon-cloud-upload',
+         *     'title': oae.api.i18n.translate('__MSG__UPLOAD__'),
+         *     'class': 'oae-trigger-upload'
+         * },
+         * {
+         *     'icon': 'icon-plus-sign',
+         *     'title': oae.api.i18n.translate('__MSG__CREATE__'),
+         *     'children': [
+         *         {
+         *             'icon': 'icon-group',
+         *             'title': oae.api.i18n.translate('__MSG__GROUP__'),
+         *             'class': 'oae-trigger-creategroup'
+         *         }
+         *     ]
+         * }]
+         *
+         * Notes:
+         *
+         * - `icon` is the FontAwesome icon class that preceeds the title of the navigation item. @see http://fontawesome.io/3.2.1/
+         * - `title` is what is shown as the title of the action button.
+         * - `class` is used to define the widget trigger. It can be extended to apply any class to the list item. Multiple classes can be added by separating them with a space.
+         * - `children` is an optional Array of lhNavActions that will be rendered as children of the list item it belongs to. Each child item has the same properties as top level items.
+         *
+         * The second section is a list of pages. Each of these pages will render one or more widgets when clicked.
+         * An example array required to initiate these pages is the following:
+         *
+         * [{
+         *     'id': 'dashboard',
+         *     'title': oae.api.i18n.translate('__MSG__RECENT_ACTIVITY__'),
+         *     'icon': 'icon-dashboard',
+         *     'layout': [
+         *         {
+         *             'width': 'col-md-12',
+         *             'widgets': [
+         *                 {
+         *                     'id': 'activity',
+         *                     'settings': {
+         *                         'context': oae.data.me,
+         *                         'canManage': true
+         *                     }
+         *                 }
+         *             ]
+         *         }
+         *     ]
+         * }]
+         *
+         * Notes:
+         *
+         * - The example shows a single `dashboard` page.
+         * - `id` is the page alias that will be used in the url (e.g. /me/dashboard).
+         * - `title` is what is shown as the title of the navigation item.
+         * - `icon` is the FontAwesome icon class that preceeds the title of the navigation item. @see http://fontawesome.io/3.2.1/
+         * - `layout` defines the structure of the page that is associated to the item.
+         *     - `width` defines the page width. This leverages Bootstrap's grid system (@see http://getbootstrap.com/css/#grid)
+         *     - `widgets` defines an Array of widgets to be loaded on the page
+         *         - `id` is the name of the widget to be loaded
+         *         - `settings` is a widget settings object that will be passed into the widget as widget data
          */
-        $(window).on('oae.trigger.lhnavigation', function(ev, lhNavigation, baseUrl) {
-            lhNavigationStructure = lhNavigation;
-            setUpNavigation(baseUrl);
+        $(window).on('oae.trigger.lhnavigation', function(ev, lhNavPages, lhNavActions, baseUrl) {
+            lhNavigationPages = lhNavPages;
+            setUpNavigation(lhNavPages, lhNavActions, baseUrl);
         });
         $(window).trigger('oae.ready.lhnavigation');
 
diff --git a/node_modules/oae-core/lhnavigation/lhnavigation.html b/node_modules/oae-core/lhnavigation/lhnavigation.html
index 1724b243616..9009fe088ee 100755
--- a/node_modules/oae-core/lhnavigation/lhnavigation.html
+++ b/node_modules/oae-core/lhnavigation/lhnavigation.html
@@ -1,30 +1,66 @@
 <!-- CSS -->
 <link rel="stylesheet" type="text/css" href="css/lhnavigation.css"/>
 
-<div id="lhnavigation-container" class="row-fluid">
-    <div class="span2">
-        <div id="lhnavigation-navigation"><!-- --></div>
+<div id="lhnavigation-container" class="row">
+    <div class="oae-lhnavigation">
+        <ul class="nav nav-list hidden-xs hidden-sm"><!-- --></ul>
     </div>
-    <div id="lhnavigation-page" class="span10"><!-- --></div>
+    <div class="oae-page col-xs-12 col-sm-12 col-md-12"><!-- --></div>
 </div>
 
 <div id="lhnavigation-navigation-template"><!--
-    <ul class="nav nav-list">
-        {for item in items}
-            <li data-id="${item.id}">
-                <a href="${baseUrl}/${item.id}">
-                    <i class="${item.icon}"></i>
-                    ${item.title}
+    {macro renderNavItem(item)}
+        {if item.id}
+            <li class="clearfix {if item.class} ${item.class}{/if}" data-id="${item.id}">
+                <a href="${baseUrl}/${item.id}" title="${item.title}">
+                    <i class="${item.icon} pull-left"></i>
+                    <div>${item.title}</div>
                 </a>
             </li>
-        {/for}
-    </ul>
+        {else}
+            <li class="clearfix hidden-md hidden-lg oae-lhnavigation-action oae-lhnavigation-border {if item.children} collapse{/if}{if item.class} ${item.class}{/if}" {for data in item.data} ${data_index}="${data}"{/for}>
+                <button type="button" class="btn btn-link" title="${item.title}">
+                    {if item.children}
+                        <div class="lhnavigation-caret-container pull-right">
+                            <i class="icon-caret-left pull-right">
+                                <span class="oae-aural-text">__MSG__OPEN_NAVIGATION__</span>
+                            </i>
+                            <i class="icon-caret-down pull-right hide">
+                                <span class="oae-aural-text">__MSG__CLOSE_NAVIGATION__</span>
+                            </i>
+                        </div>
+                    {/if}
+                    <i class="${item.icon} pull-left"></i>
+                    <div>${item.title}</div>
+                </button>
+                {if item.children}
+                    <ul class="nav nav-list lhnavigation-collapsed hide">
+                        {for child in item.children}
+                            ${renderNavItem(child)}
+                        {/for}
+                    </ul>
+                {/if}
+            </li>
+        {/if}
+    {/macro}
+
+    {for item in lhNavActions}
+        ${renderNavItem(item)}
+    {/for}
+
+    {for item in lhNavPages}
+        ${renderNavItem(item)}
+    {/for}
 --></div>
 
 <div id="lhnavigation-page-template"><!--
-    <div class="row-fluid" data-id="${id}">
-        {for column in layout}
-            <div class="${column.width || 'span12'}">
+    <div class="row" data-id="${selectedPage.id}">
+        <button type="button" class="oae-lhnavigation-toggle btn btn-link {if oae.data.me.anon} hide{else} hidden-md hidden-lg{/if}">
+            <i class="icon-align-justify"></i>
+            <span class="oae-aural-text">__MSG__TOGGLE_NAVIGATION__</span>
+        </button>
+        {for column in selectedPage.layout}
+            <div class="${column.width || 'col-md-12'}">
                 {for widget in column.widgets}
                     <div id="lhnavigation-page-${widget.id}" data-widget="${widget.id}"></div>
                 {/for}
diff --git a/node_modules/oae-core/lhnavigation/manifest.json b/node_modules/oae-core/lhnavigation/manifest.json
index e5d0414d2b6..5ced172ff1e 100644
--- a/node_modules/oae-core/lhnavigation/manifest.json
+++ b/node_modules/oae-core/lhnavigation/manifest.json
@@ -1,3 +1,7 @@
 {
+    "i18n": {
+        "default": "bundles/default.properties",
+        "nl_NL": "bundles/nl_NL.properties"
+    },
     "src": "lhnavigation.html"
 }
diff --git a/node_modules/oae-core/linkpreview/css/linkpreview.css b/node_modules/oae-core/linkpreview/css/linkpreview.css
index ce9f4b14411..b6b11b67531 100644
--- a/node_modules/oae-core/linkpreview/css/linkpreview.css
+++ b/node_modules/oae-core/linkpreview/css/linkpreview.css
@@ -14,9 +14,10 @@
  */
 
 #linkpreview-container {
-    padding: 20px 65px 30px 50px;
+    padding: 20px 0 40px;
 }
 
+/* Clean up some HTML generated by oEmbed */
 #linkpreview-container iframe + div,
 #linkpreview-container img + b {
     display: none;
@@ -24,11 +25,18 @@
 
 /* iFrame embedding */
 
+/* Safari on iOS forcibly shows all content of an iframe. We need to wrap it in a div and set the height for it. */
+#linkpreview-container iframe,
+#linkpreview-container #linkpreview-image-container,
+#linkpreview-container #linkpreview-iframe-container {
+    height: 600px;
+    overflow: auto;
+    -webkit-overflow-scrolling: touch;
+}
+
 #linkpreview-container iframe {
     border: none;
-    width: 100% !important;
-    height: 600px !important;
-    overflow: auto;
+    width: 100%;
     -webkit-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.35);
        -moz-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.35);
             box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.35);
@@ -39,7 +47,7 @@
 #linkpreview-container #linkpreview-no-embedding {
     display: block;
     margin: 0 auto 20px;
-    width: 500px;
+    max-width: 500px;
 }
 
 #linkpreview-container #linkpreview-no-embedding a {
@@ -75,7 +83,29 @@
 
 #linkpreview-container img {
     max-height: 900px;
+    max-width: 100%;
     -webkit-box-shadow: 0 0 10px 0px rgba(0, 0, 0, 0.3);
        -moz-box-shadow: 0 0 10px 0px rgba(0, 0, 0, 0.3);
             box-shadow: 0 0 10px 0px rgba(0, 0, 0, 0.3);
 }
+
+@media (min-width: 780px) {
+    #linkpreview-container iframe,
+    #linkpreview-container #linkpreview-iframe-container {
+        height: 600px;
+    }
+}
+
+@media (min-width: 400px) and (max-width: 780px) {
+    #linkpreview-container iframe,
+    #linkpreview-container #linkpreview-iframe-container {
+        height: 400px;
+    }
+}
+
+@media (max-width: 400px) {
+    #linkpreview-container iframe,
+    #linkpreview-container #linkpreview-iframe-container {
+        height: 200px;
+    }
+}
diff --git a/node_modules/oae-core/linkpreview/js/linkpreview.js b/node_modules/oae-core/linkpreview/js/linkpreview.js
index bdb73f24b63..24c527ab59d 100644
--- a/node_modules/oae-core/linkpreview/js/linkpreview.js
+++ b/node_modules/oae-core/linkpreview/js/linkpreview.js
@@ -120,9 +120,9 @@ define(['jquery', 'oae.core', 'jquery.oembed'], function($, oae) {
         var renderOEmbedPreview = function() {
             $('#linkpreview-container', $rootel).oembed(widgetData.link, {
                 // Delete the arrow that collapses the container
-                includeHandle: false,
+                'includeHandle': false,
                 // Place the content into the container instead of creating a new div
-                embedMethod: 'fill'
+                'embedMethod': 'fill'
             });
         };
 
diff --git a/node_modules/oae-core/linkpreview/linkpreview.html b/node_modules/oae-core/linkpreview/linkpreview.html
index 48fbdc43800..21f2f64f02b 100644
--- a/node_modules/oae-core/linkpreview/linkpreview.html
+++ b/node_modules/oae-core/linkpreview/linkpreview.html
@@ -6,11 +6,13 @@
 <!-- DEFAULT PREVIEW -->
 <div id="linkpreview-default-template"><!--
     {if linkProfile.previews.mediumUrl}
-        <div id="linkpreview-no-embedding" class="alert">
+        <div id="linkpreview-no-embedding" class="alert alert-warning">
             __MSG__LINK_DOES_NOT_ALLOW_EMBEDDING__
             <a href="${linkProfile.link}" class="btn btn-link" target="_blank">__MSG__OPEN_LINK_IN_NEW_WINDOW__</a>
         </div>
-        <img src="${linkProfile.previews.mediumUrl}" alt="${linkProfile.displayName|encodeForHTMLAttribute}" />
+        <div id="linkpreview-image-container">
+            <img src="${linkProfile.previews.mediumUrl}" alt="${linkProfile.displayName|encodeForHTMLAttribute}" />
+        </div>
     {else}
         <div id="linkpreview-default-container">
             <div id="linkpreview-default" class="text-center">
@@ -27,12 +29,16 @@
 
 <!-- IFRAME EMBEDDING -->
 <div id="linkpreview-iframe-template"><!--
-    <iframe src="${link}"></iframe>
+    <div id="linkpreview-iframe-container">
+        <iframe src="${link}"></iframe>
+    </div>
 --></div>
 
 <!-- IMAGE EMBEDDING -->
 <div id="linkpreview-image-template"><!--
-    <img src="${img}" alt="${linkProfile.displayName|encodeForHTMLAttribute}" />
+    <div id="linkpreview-iframe-container">
+        <img src="${img}" alt="${linkProfile.displayName|encodeForHTMLAttribute}" />
+    </div>
 --></div>
 
 <!-- JAVASCRIPT -->
diff --git a/node_modules/oae-core/manageaccess/css/manageaccess.css b/node_modules/oae-core/manageaccess/css/manageaccess.css
index 16490337f7d..95859bd3722 100644
--- a/node_modules/oae-core/manageaccess/css/manageaccess.css
+++ b/node_modules/oae-core/manageaccess/css/manageaccess.css
@@ -26,7 +26,7 @@
 }
 
 #manageaccess-modal #manageaccess-overview-shared.well {
-    height: 238px;
+    height: 260px;
     margin-bottom: 0;
     overflow: auto;
 }
@@ -39,11 +39,18 @@
     margin-bottom: 10px;
 }
 
-#manageaccess-modal #manageaccess-overview-selected > li .oae-listitem h3 {
+/* Add an IE9 fallback for threedots */
+.ie-lt10 #manageaccess-modal #manageaccess-overview-selected > li .oae-listitem h3 {
     max-width: 230px;
 }
 
+#manageaccess-modal #manageaccess-overview-selected > li .oae-listitem-actions {
+    margin-left: 7px;
+    width: auto;
+}
+
 #manageaccess-modal #manageaccess-overview-selected > li .oae-listitem-actions select {
+    height: auto;
     width: 150px;
 }
 
@@ -63,7 +70,9 @@
 }
 
 #manageaccess-modal #manageaccess-share-role {
+    height: auto;
     margin: 12px 0 0;
+    width: 150px;
 }
 
 #manageaccess-modal label[for="manageaccess-share-role"] {
@@ -71,3 +80,20 @@
     margin: 17px 10px 0 0;
 }
 
+@media (min-width: 550px) {
+    .ie-lt10 #manageaccess-modal #manageaccess-overview-selected > li .oae-listitem h3 {
+        max-width: 280px;
+    }
+}
+
+@media (min-width: 400px) and (max-width: 550px) {
+    .ie-lt10 #manageaccess-modal #manageaccess-overview-selected > li .oae-listitem h3 {
+        max-width: 180px !important;
+    }
+}
+
+@media (max-width: 400px) {
+    .ie-lt10 #manageaccess-modal #manageaccess-overview-selected > li .oae-listitem h3 {
+        max-width: 100px !important;
+    }
+}
diff --git a/node_modules/oae-core/manageaccess/js/manageaccess.js b/node_modules/oae-core/manageaccess/js/manageaccess.js
index a91eddab91b..4b51a0c2d30 100644
--- a/node_modules/oae-core/manageaccess/js/manageaccess.js
+++ b/node_modules/oae-core/manageaccess/js/manageaccess.js
@@ -378,10 +378,10 @@ define(['jquery', 'oae.core', 'jquery.autosuggest'], function($, oae) {
             });
 
             // In case the share panel is showing, focus on the autosuggest field after the modal has finished loading
-            $('#manageaccess-modal', $rootel).on('shown', focusAutoSuggest);
+            $('#manageaccess-modal', $rootel).on('shown.bs.modal', focusAutoSuggest);
 
             // Reset the widget when it is dismissed.
-            $('#manageaccess-modal', $rootel).on('hidden', reset);
+            $('#manageaccess-modal', $rootel).on('hidden.bs.modal', reset);
         };
 
         /**
@@ -420,8 +420,8 @@ define(['jquery', 'oae.core', 'jquery.autosuggest'], function($, oae) {
 
             // Catch changes in the visibility radio group
             $rootel.on('change', '.oae-large-options-container input[type="radio"]', function() {
-                $('.oae-large-options', $rootel).removeClass('checked');
-                $(this).parents('.oae-large-options').addClass('checked');
+                $('.oae-large-options-container label', $rootel).removeClass('checked');
+                $(this).parents('label').addClass('checked');
             });
 
             // Delete a member from the list
diff --git a/node_modules/oae-core/manageaccess/manageaccess.html b/node_modules/oae-core/manageaccess/manageaccess.html
index f5e427b9dda..9b2a308393e 100644
--- a/node_modules/oae-core/manageaccess/manageaccess.html
+++ b/node_modules/oae-core/manageaccess/manageaccess.html
@@ -2,38 +2,47 @@
 <link rel="stylesheet" type="text/css" href="css/manageaccess.css" />
 
 <!-- MODAL -->
-<div id="manageaccess-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="manageaccess-modal-title" aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
-        <h3 id="manageaccess-modal-title">__MSG__MANAGE_ACCESS__</h3>
-    </div>
-    <div class="modal-body">
-        <div id="manageaccess-overview">
-            <h4>__MSG__VISIBILITY__</h4>
-            <div id="manageaccess-overview-visibility" class="well">
-                <button id="manageaccess-change-visibility" class="btn pull-right">__MSG__CHANGE__</button>
-                <div id="manageaccess-overview-visibility-container"><!-- --></div>
-            </div>
-            <h4><span id="manageaccess-overview-shared-title"></span> <button id="manageaccess-share-add-more" class="btn btn-small pull-right"><i class="icon-plus-sign"></i> __MSG__ADD_MORE__</button></h4>
-            <div id="manageaccess-overview-shared" class="well">
-                <ul id="manageaccess-overview-selected" class="oae-list oae-list-compact"></ul>
-            </div>
-        </div>
-        <div id="manageaccess-visibility" class="hide"><!-- --></div>
-        <div id="manageaccess-share" class="hide"><!-- --></div>
-    </div>
-    <div class="modal-footer">
-        <div id="manageaccess-overview-footer">
-            <button class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
-            <button id="manageaccess-overview-save" class="btn btn-primary pull-right" disabled="true">__MSG__SAVE__</button>
-        </div>
-        <div id="manageaccess-visibility-footer" class="hide">
-            <button class="manageaccess-cancel btn btn-link pull-left">__MSG__CANCEL__</button>
-            <button id="manageaccess-visibility-save" class="btn btn-primary pull-right">__MSG__UPDATE__</button>
-        </div>
-        <div id="manageaccess-share-footer" class="hide">
-            <button class="manageaccess-cancel btn btn-link pull-left">__MSG__CANCEL__</button>
-            <button id="manageaccess-share-update" class="btn btn-primary pull-right" disabled="true">__MSG__ADD__</button>
+<div id="manageaccess-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="manageaccess-modal-title" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <form role="form">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
+                    <h3 id="manageaccess-modal-title">__MSG__MANAGE_ACCESS__</h3>
+                </div>
+                <div class="modal-body">
+                    <div id="manageaccess-overview">
+                        <h4>__MSG__VISIBILITY__</h4>
+                        <div id="manageaccess-overview-visibility" class="well">
+                            <button type="button" id="manageaccess-change-visibility" class="btn btn-sm pull-right">__MSG__CHANGE__</button>
+                            <div id="manageaccess-overview-visibility-container"><!-- --></div>
+                        </div>
+                        <h4>
+                            <button type="button" id="manageaccess-share-add-more" class="btn btn-sm pull-right"><i class="icon-plus-sign"></i> __MSG__ADD_MORE__</button>
+                            <span id="manageaccess-overview-shared-title"><!-- --></span>
+                        </h4>
+                        <div id="manageaccess-overview-shared" class="well">
+                            <ul id="manageaccess-overview-selected" class="oae-list oae-list-compact"><!-- --></ul>
+                        </div>
+                    </div>
+                    <div id="manageaccess-visibility" class="hide"><!-- --></div>
+                    <div id="manageaccess-share" class="hide"><!-- --></div>
+                </div>
+                <div class="modal-footer">
+                    <div id="manageaccess-overview-footer">
+                        <button type="button" class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
+                        <button type="button" id="manageaccess-overview-save" class="btn btn-primary pull-right" disabled="true">__MSG__SAVE__</button>
+                    </div>
+                    <div id="manageaccess-visibility-footer" class="hide">
+                        <button type="button" class="manageaccess-cancel btn btn-link pull-left">__MSG__CANCEL__</button>
+                        <button type="button" id="manageaccess-visibility-save" class="btn btn-primary pull-right">__MSG__UPDATE__</button>
+                    </div>
+                    <div id="manageaccess-share-footer" class="hide">
+                        <button type="button" class="manageaccess-cancel btn btn-link pull-left">__MSG__CANCEL__</button>
+                        <button type="button" id="manageaccess-share-update" class="btn btn-primary pull-right" disabled="true">__MSG__ADD__</button>
+                    </div>
+                </div>
+            </form>
         </div>
     </div>
 </div>
@@ -55,20 +64,22 @@ <h4><span id="manageaccess-overview-shared-title"></span> <button id="manageacce
     {for member in results}
         <li data-id="${member.profile.id}">
             <div class="oae-list-compact-item">
-                <div class="oae-listitem oae-listitem-compact">
-                    <div class="oae-listitem-actions pull-right">
-                        {var memberName = oae.api.util.security().encodeForHTMLAttribute(member.profile.displayName)}
-                        <button type="button" title="__MSG__REMOVE_MEMBER__" class="close" data-id="${member.profile.id}">&#215;</button>
-                        <label for="manageaccess-${member.profile.id}-role" class="oae-aural-text">__MSG__SELECT_ROLE_FOR_USER__</label>
-                        <select id="manageaccess-${member.profile.id}-role" data-id="${member.profile.id}">
-                            {for role in roles}
-                                <option value="${role_index}" {if member.role === role_index}selected="true"{/if}>${role}</option>
-                            {/for}
-                        </select>
-                    </div>
+                <div class="clearfix oae-listitem oae-listitem-compact">
                     ${renderThumbnail(member.profile)}
                     <div>
                         <h3 class="oae-threedots">${member.profile.displayName|encodeForHTML}</h3>
+                        <div class="oae-listitem-actions pull-right">
+                            {var memberName = oae.api.util.security().encodeForHTMLAttribute(member.profile.displayName)}
+                            <button type="button" title="__MSG__REMOVE_MEMBER__" class="close" data-id="${member.profile.id}">&#215;</button>
+                            <div class="form-group pull-right">
+                                <label for="manageaccess-${member.profile.id}-role" class="oae-aural-text">__MSG__SELECT_ROLE_FOR_USER__</label>
+                                <select id="manageaccess-${member.profile.id}-role" class="form-control" data-id="${member.profile.id}">
+                                    {for role in roles}
+                                        <option value="${role_index}" {if member.role === role_index}selected="true"{/if}>${role}</option>
+                                    {/for}
+                                </select>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -78,34 +89,40 @@ <h3 class="oae-threedots">${member.profile.displayName|encodeForHTML}</h3>
 
 <div id="manageaccess-visibility-template"><!--
     <h4>__MSG__VISIBILITY__</h4>
-    <div class="oae-large-options-container row-fluid">
-        <label for="oae-visibility-private" class="span4 text-center">
-            <div class="oae-large-options well pull-left text-center {if visibility === 'private'} checked{/if}">
-                <input type="radio" id="oae-visibility-private" value="private" name="oae-visibility-group" class="pull-left" {if visibility === 'private'} checked="checked"{/if} tabindex="0"/>
-                <i class="icon-oae-private large text-center"></i>
-                <span>${messages.private}</span>
-            </div>
-            <i class="icon-ok hide"></i>
-            <small>${messages.privateDescription}</small>
-        </label>
-        <label for="oae-visibility-loggedin" class="span4 text-center">
-            <div class="oae-large-options well pull-left text-center {if visibility === 'loggedin'} checked{/if}">
-                <input type="radio" id="oae-visibility-loggedin" value="loggedin" name="oae-visibility-group" class="pull-left" {if visibility === 'loggedin'} checked="checked"{/if} tabindex="0"/>
-                <i class="icon-oae-loggedin large text-center"></i>
-                <span>${messages.loggedin}</span>
-            </div>
-            <i class="icon-ok hide"></i>
-            <small>${messages.loggedinDescription}</small>
-        </label>
-        <label for="oae-visibility-public" class="span4 text-center">
-            <div class="oae-large-options well pull-left text-center {if visibility === 'public'} checked{/if}">
-                <input type="radio" id="oae-visibility-public" value="public" name="oae-visibility-group" class="pull-left" {if visibility === 'public'} checked="checked"{/if} tabindex="0"/>
-                <i class="icon-oae-public large text-center"></i>
-                <span>${messages.public}</span>
-            </div>
-            <i class="icon-ok hide"></i>
-            <small>${messages.publicDescription}</small>
-        </label>
+    <div class="oae-large-options-container row">
+        <div class="col-md-4 text-center">
+            <label for="oae-visibility-private" class="{if visibility === 'private'} checked{/if}">
+                <i class="icon-ok hide"></i>
+                <div class="oae-large-options well">
+                    <input type="radio" id="oae-visibility-private" value="private" name="oae-visibility-group" class="pull-left" {if visibility === 'private'} checked="checked"{/if} tabindex="0"/>
+                    <i class="icon-oae-private large text-center"></i>
+                    <span class="oae-threedots">${messages.private}</span>
+                </div>
+                <small>${messages.privateDescription}</small>
+            </label>
+        </div>
+        <div class="col-md-4 text-center">
+            <label for="oae-visibility-loggedin" class="{if visibility === 'loggedin'} checked{/if}">
+                <i class="icon-ok hide"></i>
+                <div class="oae-large-options well">
+                    <input type="radio" id="oae-visibility-loggedin" value="loggedin" name="oae-visibility-group" class="pull-left" {if visibility === 'loggedin'} checked="checked"{/if} tabindex="0"/>
+                    <i class="icon-oae-loggedin large text-center"></i>
+                    <span class="oae-threedots">${messages.loggedin}</span>
+                </div>
+                <small>${messages.loggedinDescription}</small>
+            </label>
+        </div>
+        <div class="col-md-4 text-center">
+            <label for="oae-visibility-public" class="{if visibility === 'public'} checked{/if}">
+                <i class="icon-ok hide"></i>
+                <div class="oae-large-options well">
+                    <input type="radio" id="oae-visibility-public" value="public" name="oae-visibility-group" class="pull-left" {if visibility === 'public'} checked="checked"{/if} tabindex="0"/>
+                    <i class="icon-oae-public large text-center"></i>
+                    <span class="oae-threedots">${messages.public}</span>
+                </div>
+                <small>${messages.publicDescription}</small>
+            </label>
+        </div>
     </div>
 --></div>
 
@@ -114,14 +131,16 @@ <h4>__MSG__SELECT_USERS_AND_GROUPS_TO_ADD__</h4>
     <div>
         <input type="text" id="manageaccess-share-autosuggest" placeholder="__MSG__ENTER_NAME_HERE__"/>
     </div>
-    <select id="manageaccess-share-role" class="pull-right">
-        {for role in roles}
-            <option value="${role_index}">${role}</option>
-        {/for}
-    </select>
-    <h4>
-        <label for="manageaccess-share-role" class="pull-right">__MSG__ADD_THESE_AS__</label>
-    </h4>
+    <div class="form-group clearfix">
+        <select id="manageaccess-share-role" class="pull-right form-control">
+            {for role in roles}
+                <option value="${role_index}">${role}</option>
+            {/for}
+        </select>
+        <h4>
+            <label for="manageaccess-share-role" class="pull-right">__MSG__ADD_THESE_AS__</label>
+        </h4>
+    </div>
 --></div>
 
 <!-- JAVASCRIPT -->
diff --git a/node_modules/oae-core/members/members.html b/node_modules/oae-core/members/members.html
index 842cac408ee..5bad900f779 100755
--- a/node_modules/oae-core/members/members.html
+++ b/node_modules/oae-core/members/members.html
@@ -1,13 +1,13 @@
-<div id="members-widget">
+<div id="members-widget" class="oae-list-container">
     <div class="oae-list-options">
-        <div>
-            <button class="btn oae-list-options-toggle">
-                <h2>__MSG__MEMBERS__ <i class="icon-caret-down"></i></h2>
+        <div class="row">
+            <button class="btn oae-list-options-toggle col-xs-12 col-sm-6">
+                <h2 class="pull-left">__MSG__MEMBERS__ <i class="icon-caret-down"></i></h2>
             </button>
-            <div class="pull-right">
-                <form class="form-search" id="members-search-form">
-                    <label class="oae-aural-text" for="members-search-query">__MSG__NARROW_BY_KEYWORD__</label>
-                    <input type="text" id="members-search-query" class="search-query" placeholder="__MSG__NARROW_BY_KEYWORD__">
+            <div class="pull-right col-xs-12 col-sm-6">
+                <form id="members-search-form" class="form-search" role="search">
+                    <label for="members-search-query" class="control-label oae-aural-text">__MSG__NARROW_BY_KEYWORD__</label>
+                    <input type="text" id="members-search-query" class="form-control pull-right search-query" placeholder="__MSG__NARROW_BY_KEYWORD__"/>
                 </form>
             </div>
         </div>
diff --git a/node_modules/oae-core/memberships/memberships.html b/node_modules/oae-core/memberships/memberships.html
index 5b81cbb9006..73d1022a634 100644
--- a/node_modules/oae-core/memberships/memberships.html
+++ b/node_modules/oae-core/memberships/memberships.html
@@ -1,13 +1,13 @@
 <div id="memberships-widget" class="oae-list-container">
     <div class="oae-list-options">
-        <div>
-            <button class="btn oae-list-options-toggle">
-                <h2>__MSG__GROUPS__ <i class="icon-caret-down"></i></h2>
+        <div class="row">
+            <button class="btn oae-list-options-toggle col-xs-12 col-sm-6">
+                <h2 class="pull-left">__MSG__GROUPS__ <i class="icon-caret-down"></i></h2>
             </button>
-            <div class="pull-right">
-                <form class="form-search" id="memberships-search-form">
-                    <label class="oae-aural-text" for="memberships-search-query">__MSG__NARROW_BY_KEYWORD__</label>
-                    <input type="text" id="memberships-search-query" class="search-query" placeholder="__MSG__NARROW_BY_KEYWORD__">
+            <div class="pull-right col-xs-12 col-sm-6">
+                <form id="memberships-search-form" class="form-search" role="search">
+                    <label for="memberships-search-query" class="control-label oae-aural-text">__MSG__NARROW_BY_KEYWORD__</label>
+                    <input type="text" id="memberships-search-query" class="form-control pull-right search-query" placeholder="__MSG__NARROW_BY_KEYWORD__"/>
                 </form>
             </div>
         </div>
diff --git a/node_modules/oae-core/network/css/network.css b/node_modules/oae-core/network/css/network.css
index 942ae650f0d..90e8b249a6e 100644
--- a/node_modules/oae-core/network/css/network.css
+++ b/node_modules/oae-core/network/css/network.css
@@ -13,6 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#network-widget .oae-list-options {
-    border-bottom: none;
+#network-widget #network-tab-container {
+    margin-bottom: 20px;
 }
diff --git a/node_modules/oae-core/network/js/network.js b/node_modules/oae-core/network/js/network.js
index f5f7695c6d1..c2e3f3021a9 100755
--- a/node_modules/oae-core/network/js/network.js
+++ b/node_modules/oae-core/network/js/network.js
@@ -170,7 +170,7 @@ define(['jquery', 'oae.core', 'jquery.history'], function($, oae) {
             });
 
             // Disable/enable list option buttons per tab
-            $('a[data-toggle="tab"]', $rootel).on('shown', function(ev) {
+            $('a[data-toggle="tab"]', $rootel).on('shown.bs.tab', function(ev) {
                 if ($(ev.target).attr('data-type') === 'followers') {
                     getFollowers();
                     $('.oae-list-selectall', $rootel).hide();
diff --git a/node_modules/oae-core/network/network.html b/node_modules/oae-core/network/network.html
index 75d3abc0ecf..011c1fe3eab 100755
--- a/node_modules/oae-core/network/network.html
+++ b/node_modules/oae-core/network/network.html
@@ -3,14 +3,14 @@
 
 <div id="network-widget" class="oae-list-container">
     <div class="oae-list-options">
-        <div>
-            <button class="btn oae-list-options-toggle">
-                <h2>__MSG__NETWORK__ <i class="icon-caret-down"></i></h2>
+        <div class="row">
+            <button class="btn oae-list-options-toggle col-xs-12 col-sm-6">
+                <h2 class="pull-left">__MSG__NETWORK__ <i class="icon-caret-down"></i></h2>
             </button>
-            <div class="pull-right">
-                <form class="form-search" id="network-search-form">
-                    <label class="oae-aural-text" for="network-search-query">__MSG__NARROW_BY_KEYWORD__</label>
-                    <input type="text" id="network-search-query" class="search-query" placeholder="__MSG__NARROW_BY_KEYWORD__">
+            <div class="pull-right col-xs-12 col-sm-6">
+                <form id="network-search-form" class="form-search" role="search">
+                    <label for="network-search-query" class="oae-aural-text">__MSG__NARROW_BY_KEYWORD__</label>
+                    <input type="text" id="network-search-query" class="form-control pull-right search-query" placeholder="__MSG__NARROW_BY_KEYWORD__"/>
                 </form>
             </div>
         </div>
diff --git a/node_modules/oae-core/notifications/css/notifications.css b/node_modules/oae-core/notifications/css/notifications.css
index de8566da8f8..8401f8e2277 100644
--- a/node_modules/oae-core/notifications/css/notifications.css
+++ b/node_modules/oae-core/notifications/css/notifications.css
@@ -16,18 +16,15 @@
 /* Clickover positioning relative to its trigger */
 
 .oae-trigger-notifications + .popover {
-    left: 45px !important;
+    left: 30px !important;
     top: 50px !important;
 }
 
 .oae-trigger-notifications + .popover.bottom .arrow {
+    left: 245px !important;
     margin-left: -188px;
 }
 
-.oae-trigger-notifications + .popover.bottom.notifications-empty-container .arrow {
-    margin-left: -100px;
-}
-
 .oae-trigger-notifications + .popover .popover-content {
     padding: 0;
 }
@@ -35,15 +32,12 @@
 /* Container */
 
 #notifications-container {
-    width: 500px;
+    min-width: 270px;
+    line-height: 1.5;
     max-height: 254px;
     overflow: auto;
 }
 
-.notifications-empty-container #notifications-container {
-    width: 325px;
-}
-
 #notifications-container .oae-list {
     padding-top: 10px;
 }
@@ -57,11 +51,14 @@
 }
 
 #notifications-container .oae-listitem .notifications-summary {
-    padding-right: 20px;
     word-wrap: break-word;
     max-width: 350px;
 }
 
+#notifications-container .oae-listitem .notifications-thumbnail {
+    margin-left: 20px;
+}
+
 #notifications-container .oae-listitem .notifications-summary.notification-object {
     max-width: 290px;
 }
diff --git a/node_modules/oae-core/notifications/notifications.html b/node_modules/oae-core/notifications/notifications.html
index ff80a633cad..b77c0f54bc1 100644
--- a/node_modules/oae-core/notifications/notifications.html
+++ b/node_modules/oae-core/notifications/notifications.html
@@ -31,7 +31,7 @@
                     ${renderThumbnail(actor)}
                 </div>
                 {if !previewObj['oae:collection'] && previewObj['oae:id'] !== oae.data.me.id}
-                    <div class="pull-right">
+                    <div class="pull-right hidden-xs hidden-sm notifications-thumbnail">
                         ${renderThumbnail(previewObj)}
                     </div>
                 {/if}
diff --git a/node_modules/oae-core/productvideo/css/productvideo.css b/node_modules/oae-core/productvideo/css/productvideo.css
index b33b0f7d372..f8e268e0b6a 100644
--- a/node_modules/oae-core/productvideo/css/productvideo.css
+++ b/node_modules/oae-core/productvideo/css/productvideo.css
@@ -13,10 +13,22 @@
  * permissions and limitations under the License.
  */
 
-#productvideo-modal {
-    margin-left: -480px;
-    width: 960px;
-    height: 540px;
+/*#productvideo-modal {
+    margin-left: -440px;
+}*/
+
+#productvideo-modal .modal-dialog,
+#productvideo-modal .modal-dialog .modal-body {
+    margin: 0;
+    padding: 0;
+}
+
+#productvideo-modal .modal-content {
+    background: none;
+    border: none;
+    -webkit-box-shadow: none;
+       -moz-box-shadow: none;
+            box-shadow: none;
 }
 
 #productvideo-modal iframe {
@@ -24,3 +36,7 @@
        -moz-border-radius: 4px;
             border-radius: 4px;
 }
+
+#productvideo-modal .modal-dialog .modal-body {
+    padding-top: 60px;
+}
diff --git a/node_modules/oae-core/productvideo/js/productvideo.js b/node_modules/oae-core/productvideo/js/productvideo.js
index 5c1f9535f21..965dea506cf 100644
--- a/node_modules/oae-core/productvideo/js/productvideo.js
+++ b/node_modules/oae-core/productvideo/js/productvideo.js
@@ -25,14 +25,18 @@ define(['jquery', 'oae.core'], function($, oae) {
          */
         var reset = function() {
             // Stop the video by removing it from the widget
-            $('#productvideo-modal', $rootel).empty();
+            $('#productvideo-modal .modal-body', $rootel).empty();
         };
 
         /**
          * Renders the video in the modal dialog
          */
         var renderProductVideo = function() {
-            oae.api.util.template().render($('#productvideo-template', $rootel), null, $('#productvideo-modal', $rootel));
+            oae.api.util.template().render($('#productvideo-template', $rootel), {
+                'width': $(window).width() - ($(window).width() / 4),
+                'height': $(window).width() * 0.42
+            }, $('#productvideo-modal .modal-body', $rootel));
+            $('#productvideo-modal .modal-body', $rootel).css('margin-left', ($(window).width() / 8) + 'px');
         };
 
         /**
@@ -46,8 +50,8 @@ define(['jquery', 'oae.core'], function($, oae) {
                 $('#productvideo-modal', $rootel).modal();
             });
 
-            $('#productvideo-modal', $rootel).on('hide', reset);
-            $('#productvideo-modal', $rootel).on('show', renderProductVideo);
+            $('#productvideo-modal', $rootel).on('hide.bs.modal', reset);
+            $('#productvideo-modal', $rootel).on('show.bs.modal', renderProductVideo);
         };
 
         setUpProductVideo();
diff --git a/node_modules/oae-core/productvideo/productvideo.html b/node_modules/oae-core/productvideo/productvideo.html
index c8f3b40a5ff..85f7bc50ecf 100644
--- a/node_modules/oae-core/productvideo/productvideo.html
+++ b/node_modules/oae-core/productvideo/productvideo.html
@@ -2,10 +2,16 @@
 <link rel="stylesheet" type="text/css" href="css/productvideo.css" />
 
 <!-- MODAL -->
-<div id="productvideo-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="productvideo-modal-title" aria-hidden="true"><!-- --></div>
+<div id="productvideo-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="productvideo-modal-title" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+        	<div class="modal-body"><!-- --></div>
+        </div>
+    </div>
+</div>
 
 <div id="productvideo-template"><!--
-    <iframe width="960" height="540" src="//www.youtube.com/embed/cfiM87Y0pWw?rel=0&autoplay=1&enablejsapi=1&controls=0&showinfo=0&modestbranding=1" frameborder="0" allowfullscreen></iframe>
+    <iframe width="${width}" height="${height}" src="//www.youtube.com/embed/cfiM87Y0pWw?rel=0&autoplay=1&enablejsapi=1&controls=0&showinfo=0&modestbranding=1" frameborder="0" allowfullscreen></iframe>
 --></div>
 
 <!-- JAVASCRIPT -->
diff --git a/node_modules/oae-core/register/bundles/default.properties b/node_modules/oae-core/register/bundles/default.properties
index 6026b458b3b..21e2d313323 100644
--- a/node_modules/oae-core/register/bundles/default.properties
+++ b/node_modules/oae-core/register/bundles/default.properties
@@ -2,7 +2,11 @@ BACK = Back
 CAPTCHA_ERROR = Captcha validation failed. Please enter the challenge words below.
 CREATE_ACCOUNT = Create account
 CREATE_ACCOUNT_INVALIDCHAR = Username contains an invalid character
+ENTER_THE_TEXT = Enter the text
 FIRSTNAME = First name:
+GET_A_NEW_CHALLENGE = Get a new challenge
+GET_A_VISUAL_CHALLENGE = Get a visual challenge
+GET_AN_AUDIO_CHALLENGE = Get an audio challenge
 I_AGREE_TO_THE_TERMS_AND_CONDITIONS = I agree to the <button id="register-terms-and-conditions" class="btn btn-link oae-plain-link" type="button">Terms and Conditions</button>
 LASTNAME = Last name:
 PLEASE_ACCEPT_THE_TERMS_AND_CONDITIONS = Please accept the Terms and Conditions
diff --git a/node_modules/oae-core/register/bundles/nl_NL.properties b/node_modules/oae-core/register/bundles/nl_NL.properties
index 0f9283c37e4..68c4247fb09 100644
--- a/node_modules/oae-core/register/bundles/nl_NL.properties
+++ b/node_modules/oae-core/register/bundles/nl_NL.properties
@@ -3,7 +3,11 @@ BACK=Terug
 CAPTCHA_ERROR=Captcha validatie is mislukt. Voer de woorden hieronder in.
 CREATE_ACCOUNT=Account aanmaken
 CREATE_ACCOUNT_INVALIDCHAR=Gebruikersnaam bevat een ongeldig teken
+ENTER_THE_TEXT = Voer de uitdaging in
 FIRSTNAME=Voornaam\:
+GET_A_NEW_CHALLENGE = Gebruik een nieuwe uitdaging
+GET_A_VISUAL_CHALLENGE = Gebruik een visuele uitdaging
+GET_AN_AUDIO_CHALLENGE = Gebruik een audio uitdaging
 I_AGREE_TO_THE_TERMS_AND_CONDITIONS=Ik ga akkoord met de <button id\="register-terms-and-conditions" class\="btn btn-link oae-plain-link" type\="button">gebruiksvoorwaarden</button>
 LASTNAME=Achternaam\:
 PLEASE_ACCEPT_THE_TERMS_AND_CONDITIONS=Ga akkoord met de gebruiksvoorwaarden
diff --git a/node_modules/oae-core/register/css/register.css b/node_modules/oae-core/register/css/register.css
index 59a2e8ac101..f8c22bb1338 100644
--- a/node_modules/oae-core/register/css/register.css
+++ b/node_modules/oae-core/register/css/register.css
@@ -13,24 +13,27 @@
  * permissions and limitations under the License.
  */
 
-#register-modal {
+#register-modal .modal-dialog {
     width: 900px;
-    margin-left: -450px;
 }
 
 #register-form {
     margin: 0;
 }
 
+#register-form .control-label {
+    padding-right: 5px;
+}
+
 #register-username-controls {
     position: relative;
 }
 
 #register-username-available {
-    position: absolute;
-    top: 5px;
-    left: 210px;
     font-size: 18px;
+    position: absolute;
+    right: 10px;
+    top: 8px;
 }
 
 #register-username-available.icon-remove {
@@ -40,7 +43,7 @@
 #register-captcha {
     position: relative;
     min-height: 30px;
-    margin: 10px 0 0;
+    margin-top: 25px;
 }
 
 #register-captcha-error {
@@ -48,12 +51,8 @@
 }
 
 #register-accept-and-create-container {
-    margin-top: 10px;
-}
-
-#register-accept-and-create-container label {
-    display: inline-block;
-    margin-bottom: 40px;
+    margin-top: 20px;
+    margin-bottom: 60px;
 }
 
 #register-create-account {
@@ -74,19 +73,49 @@
     overflow: auto;
 }
 
-#register-accept-and-create-container label.oae-error {
+#register-accept-and-create-container .has-error.help-block {
     margin-bottom: 0;
 }
 
-#register-captcha.control-group .controls {
-    margin-left: 50px;
+#recaptcha_image img {
+    border: 1px solid;
+}
+
+#recaptcha_image,
+#recaptcha_image img {
+    width: 100% !important;
+    height: auto !important;
 }
 
-/* Recaptcha overrides */
-.recaptchatable {
-    background-color: #FFF;
+#register-captcha-container > div {
+    padding-right: 0;
+}
+
+#register-captcha-container a.btn {
+    margin-bottom: 7px;
+}
+
+#register-captcha-container .form-group {
+    margin: 7px 0 0 0;
+}
+
+@media (max-width: 991px) {
+    #register-modal .modal-dialog {
+        margin: 10px;
+    }
+
+    #register-modal .modal-dialog,
+    #register-modal .modal-content {
+        width: auto;
+    }
+
+    #register-username-container {
+        margin-top: 15px;
+    }
 }
 
-.recaptchatable #recaptcha_response_field {
-    font-size: 14px !important;
+@media (max-width: 767px) {
+    #register-accept-and-create-container {
+        margin-top: 10px;
+    }
 }
diff --git a/node_modules/oae-core/register/js/register.js b/node_modules/oae-core/register/js/register.js
index a7738764c0d..aee49c42f2d 100644
--- a/node_modules/oae-core/register/js/register.js
+++ b/node_modules/oae-core/register/js/register.js
@@ -32,16 +32,16 @@ define(['jquery', 'underscore', 'oae.core', 'markdown'], function($, _, oae) {
          */
         var setUpReCaptcha = function() {
             if (recaptchaEnabled) {
-                $('#register-captcha', $rootel).addClass('span7');
-                $('#register-accept-and-create-container', $rootel).addClass('span5');
+                $('#register-captcha', $rootel).addClass('col-md-7');
+                $('#register-accept-and-create-container', $rootel).addClass('col-md-5');
                 // Only require the recaptcha library when recaptcha has been enabled
                 require(['//www.google.com/recaptcha/api/js/recaptcha_ajax.js'], function() {
                     var captchaContainer = $('#register-captcha-container', $rootel)[0];
-                    Recaptcha.create(oae.api.config.getValue('oae-principals', 'recaptcha', 'publicKey'), captchaContainer, {theme: 'clean'});
+                    Recaptcha.create(oae.api.config.getValue('oae-principals', 'recaptcha', 'publicKey'), captchaContainer, {theme: 'custom'});
                 });
             } else {
                 $('#register-captcha', $rootel).hide();
-                $('#register-accept-and-create-container', $rootel).addClass('span12');
+                $('#register-accept-and-create-container', $rootel).addClass('col-md-12');
             }
         };
 
@@ -54,7 +54,7 @@ define(['jquery', 'underscore', 'oae.core', 'markdown'], function($, _, oae) {
                 'aria-invalid': 'true',
                 'aria-describedby': 'register-captcha-error'
             });
-            $('#register-captcha', $rootel).addClass('error');
+            $('#register-captcha', $rootel).addClass('has-error');
             $('#register-captcha-error', $rootel).show();
         };
 
@@ -65,7 +65,7 @@ define(['jquery', 'underscore', 'oae.core', 'markdown'], function($, _, oae) {
             // Remove the aria attributes on the main recaptcha input field
             $('#recaptcha-response-field', $rootel).removeAttr('aria-invalid aria-describedby');
             $('#register-captcha-error', $rootel).hide();
-            $('#register-captcha', $rootel).removeClass('error');
+            $('#register-captcha', $rootel).removeClass('has-error');
         };
 
         /**
@@ -281,7 +281,7 @@ define(['jquery', 'underscore', 'oae.core', 'markdown'], function($, _, oae) {
                 $('#register-modal', $rootel).modal({
                     'backdrop': 'static'
                 });
-                $('#register-modal', $rootel).on('shown', function () {
+                $('#register-modal', $rootel).on('shown.bs.modal', function () {
                     // Set focus to the group name field
                     $('#register-firstname', $rootel).focus();
                 });
diff --git a/node_modules/oae-core/register/register.html b/node_modules/oae-core/register/register.html
index f1c5693737a..e8ec133a5a9 100644
--- a/node_modules/oae-core/register/register.html
+++ b/node_modules/oae-core/register/register.html
@@ -2,87 +2,112 @@
 <link rel="stylesheet" type="text/css" href="css/register.css" />
 
 <!-- MODAL -->
-<div id="register-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="register-modal-title" aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
-        <h3 id="register-modal-title">__MSG__SIGN_UP__</h3>
-    </div>
-    <div class="modal-body">
-        <form id="register-form" class="form-horizontal" method="POST">
-            <div class="row-fluid">
-                <div class="span6">
-                    <div class="control-group">
-                        <label class="control-label" for="register-firstname">__MSG__FIRSTNAME__</label>
-                        <div class="controls">
-                            <input type="text" id="register-firstname" name="firstName" class="input-block-level required maxlength-short" placeholder="Hiroyuki" />
-                        </div>
-                    </div>
-                    <div class="control-group">
-                        <label class="control-label" for="register-lastname">__MSG__LASTNAME__</label>
-                        <div class="controls">
-                            <input type="text" id="register-lastname" name="lastName" class="input-block-level required maxlength-short" placeholder="Sakai" />
-                        </div>
-                    </div>
-                    <div class="control-group">
-                        <label class="control-label" for="register-email">__MSG__EMAIL_COLON__</label>
-                        <div class="controls">
-                            <input type="text" id="register-email" name="email" class="input-block-level required email maxlength-short" placeholder="hiroyuki.sakai@example.com" />
-                        </div>
-                    </div>
-                </div>
-                <div class="span6">
-                    <div id="register-username-container" class="control-group">
-                        <label class="control-label" for="register-username">__MSG__USERNAME_COLON__</label>
-                        <div id="register-username-controls" class="controls">
-                            <input type="text" id="register-username" name="username" class="input-block-level required maxlength-short" placeholder="Hiroyuki" />
-                            <i id="register-username-available" class="icon-remove"></i>
-                        </div>
-                    </div>
-                    <div class="control-group">
-                        <label class="control-label" for="register-password">__MSG__PASSWORD_COLON__</label>
-                        <div class="controls">
-                            <input type="password" id="register-password" name="password" class="input-block-level required maxlength-short" placeholder="&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;" />
+<div id="register-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="register-modal-title" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
+                <h3 id="register-modal-title">__MSG__SIGN_UP__</h3>
+            </div>
+            <div class="modal-body">
+                <form id="register-form" class="form-horizontal" role="form" method="POST">
+                    <div class="row">
+                        <div class="col-md-6">
+                            <div class="form-group">
+                                <label class="col-lg-5 control-label text-right" for="register-firstname">__MSG__FIRSTNAME__</label>
+                                <div class="col-lg-7">
+                                    <input type="text" id="register-firstname" name="firstName" class="form-control required maxlength-short" placeholder="Hiroyuki" />
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-lg-5 control-label text-right" for="register-lastname">__MSG__LASTNAME__</label>
+                                <div class="col-lg-7">
+                                    <input type="text" id="register-lastname" name="lastName" class="form-control required maxlength-short" placeholder="Sakai" />
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-lg-5 control-label text-right" for="register-email">__MSG__EMAIL_COLON__</label>
+                                <div class="col-lg-7">
+                                    <input type="text" id="register-email" name="email" autocapitalize="off" class="form-control required email maxlength-short" placeholder="hiroyuki.sakai@example.com" />
+                                </div>
+                            </div>
                         </div>
-                    </div>
-                    <div class="control-group">
-                        <label class="control-label" for="register-password-repeat">__MSG__RE_TYPE_PASSWORD__</label>
-                        <div class="controls">
-                            <input type="password" id="register-password-repeat" name="password_repeat" class="input-block-level required maxlength-short" placeholder="&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;" />
+                        <div class="col-md-6">
+                            <div id="register-username-container" class="form-group">
+                                <label class="col-lg-5 control-label text-right" for="register-username">__MSG__USERNAME_COLON__</label>
+                                <div class="col-lg-7">
+                                    <div id="register-username-controls">
+                                        <input type="text" id="register-username" name="username" autocapitalize="off" class="form-control required maxlength-short" placeholder="Hiroyuki" />
+                                        <i id="register-username-available" class="icon-remove"></i>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-lg-5 control-label text-right" for="register-password">__MSG__PASSWORD_COLON__</label>
+                                <div class="col-lg-7">
+                                    <input type="password" id="register-password" name="password" class="form-control required maxlength-short" placeholder="&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;" />
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-lg-5 control-label text-right" for="register-password-repeat">__MSG__RE_TYPE_PASSWORD__</label>
+                                <div class="col-lg-7">
+                                    <input type="password" id="register-password-repeat" name="password_repeat" class="form-control required maxlength-short" placeholder="&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;" />
+                                </div>
+                            </div>
                         </div>
                     </div>
-                </div>
-            </div>
-            <div class="row-fluid">
-                <div id="register-captcha" class="control-group">
-                    <div class="control-group">
-                        <div class="controls">
-                            <div id="register-captcha-container"><!-- --></div>
-                            <label id="register-captcha-error" class="hide help-block" for="recaptcha_response_field">__MSG__CAPTCHA_ERROR__</label>
+                    <div class="row">
+                        <div id="register-captcha" class="form-group col-xs-12 col-sm-7 col-md-7">
+                            <div id="register-captcha-container">
+                                <div class="col-xs-10 col-sm-11 col-md-11">
+                                    <div id="recaptcha_image"></div>
+                                    <div class="form-group">
+                                        <label for="recaptcha_response_field" class="control-label oae-aural-text">__MSG__ENTER_THE_TEXT__</label>
+                                        <input type="text" id="recaptcha_response_field" class="form-control" autocapitalize="off" name="recaptcha_response_field" placeholder="__MSG__ENTER_THE_TEXT__"/>
+                                        <label id="register-captcha-error" class="hide help-block" for="recaptcha_response_field">__MSG__CAPTCHA_ERROR__</label>
+                                    </div>
+                                </div>
+
+                                <div class="col-xs-1 col-sm-1 col-md-1">
+                                    <div>
+                                        <a class="btn" href="javascript:Recaptcha.reload()" title="__MSG__GET_A_NEW_CHALLENGE__">
+                                            <i class="icon-refresh"></i>
+                                        </a>
+                                    </div>
+                                    <div class="recaptcha_only_if_image">
+                                        <a class="btn" href="javascript:Recaptcha.switch_type('audio')" title="__MSG__GET_AN_AUDIO_CHALLENGE__">
+                                            <i class="icon-volume-up"></i>
+                                        </a>
+                                    </div>
+                                    <div class="recaptcha_only_if_audio">
+                                        <a class="btn" href="javascript:Recaptcha.switch_type('image')" title="__MSG__GET_A_VISUAL_CHALLENGE__">
+                                            <i class="icon-font"></i>
+                                        </a>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
-                    </div>
-                </div>
 
-                <div id="register-accept-and-create-container" class="pull-right">
-                    <div class="row-fluid">
-                        <div class="pull-right text-right">
-                            <div id="register-accept-terms-button" class="control-group hide">
-                                <div class="help help-block"></div>
-                                <label for="register-accept-terms-and-conditions" class="checkbox">
-                                    <input type="checkbox" id="register-accept-terms-and-conditions" class="required" name="termsandconditions"/>__MSG__I_AGREE_TO_THE_TERMS_AND_CONDITIONS__
-                                </label>
+                        <div id="register-accept-and-create-container" class="pull-right col-xs-12 col-sm-5 col-md-5">
+                            <div class="pull-right text-right">
+                                <div id="register-accept-terms-button" class="form-group hide">
+                                    <label for="register-accept-terms-and-conditions" class="checkbox control-label">
+                                        <input type="checkbox" id="register-accept-terms-and-conditions" class="required" name="termsandconditions"/>__MSG__I_AGREE_TO_THE_TERMS_AND_CONDITIONS__
+                                    </label>
+                                    <div class="help help-block"></div>
+                                </div>
                             </div>
-                            <button type="submit" id="register-create-account" class="btn btn-primary pull-right">__MSG__CREATE_ACCOUNT__</button>
                         </div>
+                        <button type="submit" id="register-create-account" class="btn btn-primary pull-right">__MSG__CREATE_ACCOUNT__</button>
                     </div>
-                </div>
-            </div>
-        </form>
-
-        <div id="register-terms-and-conditions-container" class="hide"><!-- --></div>
-    </div>
+                </form>
 
-    <div class="modal-footer hide">
-        <button type="button" id="register-continue-signup" class="btn btn-primary pull-right">__MSG__BACK__</button>
+                <div id="register-terms-and-conditions-container" class="hide"><!-- --></div>
+            </div>
+            <div class="modal-footer hide">
+                <button type="button" id="register-continue-signup" class="btn btn-primary pull-right">__MSG__BACK__</button>
+            </div>
+        </div>
     </div>
 </div>
 
diff --git a/node_modules/oae-core/revisions/css/revisions.css b/node_modules/oae-core/revisions/css/revisions.css
index b88cc40fb2c..aca08201a76 100755
--- a/node_modules/oae-core/revisions/css/revisions.css
+++ b/node_modules/oae-core/revisions/css/revisions.css
@@ -13,15 +13,8 @@
  * permissions and limitations under the License.
  */
 
-/* Modal */
-
-#revisions-modal {
-    width: 900px;
-    margin-left: -450px;
-}
-
-#revisions-modal .modal-body {
-    padding: 5px 0 10px 20px;
+#revisions-modal .modal-dialog .row {
+    margin: 0;
 }
 
 /* Default revision preview */
@@ -47,29 +40,21 @@
 /* Revision preview */
 
 #revisions-modal #revisions-preview {
-    padding: 10px 20px 5px 5px;
-    height: 380px;
-    width: 560px;
+    padding: 10px 5px 5px;
     position: relative;
     overflow: auto;
 }
 
-#revisions-modal #revisions-preview #revisions-image-container {
-    line-height: 350px;
-}
-
 #revisions-modal #revisions-preview #revisions-image-container img {
-    max-width: 554px;
+    max-width: 100%;
     max-height: 360px;
 }
 
 /* Revision list */
 
 #revisions-modal #revisions-list-container {
-    margin-left: 0;
     height: 380px;
     padding: 10px 0 10px 10px;
-    width: 300px;
     overflow: auto;
 }
 
@@ -121,3 +106,18 @@
     font-size: 13px;
     margin-right: 2px;
 }
+
+@media (min-width: 992px) {
+    #revisions-modal .modal-dialog {
+        width: 80%;
+    }
+
+    #revisions-modal #revisions-preview {
+        height: 380px;
+        padding-right: 20px;
+    }
+
+    #revisions-modal #revisions-preview #revisions-image-container {
+        line-height: 350px;
+    }
+}
diff --git a/node_modules/oae-core/revisions/js/revisions.js b/node_modules/oae-core/revisions/js/revisions.js
index 671fdae1f98..24b63c48f8d 100755
--- a/node_modules/oae-core/revisions/js/revisions.js
+++ b/node_modules/oae-core/revisions/js/revisions.js
@@ -194,7 +194,7 @@ define(['jquery', 'oae.core'], function($, oae) {
             });
 
             // Request the current page context when the modal is showing
-            $('#revisions-modal', $rootel).on('shown', function () {
+            $('#revisions-modal', $rootel).on('shown.bs.modal', function () {
                 $(document).trigger('oae.context.get', 'revisions');
             });
 
diff --git a/node_modules/oae-core/revisions/revisions.html b/node_modules/oae-core/revisions/revisions.html
index c0fb91ef4a3..a2e8f8fd1d5 100755
--- a/node_modules/oae-core/revisions/revisions.html
+++ b/node_modules/oae-core/revisions/revisions.html
@@ -3,16 +3,20 @@
 
 
 <!-- MODAL -->
-<div id="revisions-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="revisions-modal-title" aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
-        <h3 id="revisions-modal-title">__MSG__REVISION_HISTORY__</h3>
-    </div>
-    <div class="modal-body container-fluid">
-        <div class="row-fluid">
-            <div id="revisions-preview" class="span8"><!-- --></div>
-            <div id="revisions-list-container" class="span4 well">
-                <ul id="revisions-list" class="oae-list"><!-- --></ul>
+<div id="revisions-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="revisions-modal-title" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
+                <h3 id="revisions-modal-title">__MSG__REVISION_HISTORY__</h3>
+            </div>
+            <div class="modal-body">
+                <div class="row">
+                    <div id="revisions-preview" class="col-xs-12 col-sm-12 col-md-8"><!-- --></div>
+                    <div id="revisions-list-container" class="col-xs-12 col-sm-12 col-md-4 well">
+                        <ul id="revisions-list" class="oae-list"><!-- --></ul>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
@@ -57,11 +61,11 @@ <h5>__MSG__NO_PREVIEW__</h5>
             </div>
             <span>${revision.createdBy.displayName|encodeForHTML}</span>
             <div class="revisions-list-actions hide">
-                <button type="button" class="revisions-list-actions-restore btn btn-small">
+                <button type="button" class="revisions-list-actions-restore btn btn-sm">
                     <i class="icon-undo"></i> __MSG__RESTORE__
                 </button>
                 {if resourceSubType === 'file'}
-                    <a href="/api/content/${revision.contentId}/download/${revision.revisionId}" class="revisions-list-actions-download btn btn-small">
+                    <a href="/api/content/${revision.contentId}/download/${revision.revisionId}" class="revisions-list-actions-download btn btn-sm">
                         <i class="icon-download"></i> __MSG__DOWNLOAD__
                     </a>
                 {/if}
diff --git a/node_modules/oae-core/setpermissions/js/setpermissions.js b/node_modules/oae-core/setpermissions/js/setpermissions.js
index 032a063c540..8ddfd0aa549 100644
--- a/node_modules/oae-core/setpermissions/js/setpermissions.js
+++ b/node_modules/oae-core/setpermissions/js/setpermissions.js
@@ -98,6 +98,8 @@ define(['jquery', 'oae.core'], function($, oae) {
                     'visibility': visibility
                 })
             });
+
+            return false;
         };
 
         /**
@@ -132,7 +134,7 @@ define(['jquery', 'oae.core'], function($, oae) {
             // Render the setpermissions template
             oae.api.util.template().render('#setpermissions-template', widgetData, '#setpermissions-container');
 
-            $('#setpermissions-savepermissions', $rootel).on('click', savePermissionsChange);
+            $('#setpermissions-form', $rootel).on('submit', savePermissionsChange);
             $('#setpermissions-cancelpermissions', $rootel).on('click', cancelPermissionsChange);
 
             // Trigger and bind an event that will ask for the page context
diff --git a/node_modules/oae-core/setpermissions/setpermissions.html b/node_modules/oae-core/setpermissions/setpermissions.html
index 9c0f3bf2cde..7c574b37f3b 100644
--- a/node_modules/oae-core/setpermissions/setpermissions.html
+++ b/node_modules/oae-core/setpermissions/setpermissions.html
@@ -4,28 +4,38 @@
 <div id="setpermissions-container"><!-- --></div>
 
 <div id="setpermissions-template"><!--
-    <h4>__MSG__VISIBILITY__</h4>
-    <label>
-        <input type="radio" value="private" name="setpermissions-visibility" class="pull-left" {if visibility === 'private'} checked="checked"{/if}/>
-        <i class="icon-oae-private pull-left"></i>
-        <span>__MSG__PRIVATE__</span>
-    </label>
-    <label>
-        <input type="radio" value="loggedin" name="setpermissions-visibility" class="pull-left" {if visibility === 'loggedin'} checked="checked"{/if}/>
-        <i class="icon-oae-loggedin pull-left"></i>
-        <span>${oae.data.me.tenant.displayName|encodeForHTML}</span>
-    </label>
-    <label>
-        <input type="radio" value="public" name="setpermissions-visibility" class="pull-left" {if visibility === 'public'} checked="checked"{/if}/>
-        <i class="icon-oae-public pull-left"></i>
-        <span>__MSG__PUBLIC__</span>
-    </label>
-    <h4>__MSG__SHARE_WITH__</h4>
-    <input type="text" id="setpermissions-share" placeholder="__MSG__ENTER_NAME_HERE__"/>
-    <div id="setpermissions-footer" class="modal-footer">
-        <button type="button" class="btn btn-link pull-left" id="setpermissions-cancelpermissions">__MSG__CANCEL__</button>
-        <button type="button" class="btn btn-primary pull-right" id="setpermissions-savepermissions">__MSG__UPDATE__</button>
-    </div>
+    <form id="setpermissions-form" role="form">
+        <h4>__MSG__VISIBILITY__</h4>
+        <div class="radio">
+            <label>
+                <input type="radio" value="private" name="setpermissions-visibility" class="pull-left" {if visibility === 'private'} checked="checked"{/if}/>
+                <i class="icon-oae-private pull-left"></i>
+                <span>__MSG__PRIVATE__</span>
+            </label>
+        </div>
+        <div class="radio">
+            <label>
+                <input type="radio" value="loggedin" name="setpermissions-visibility" class="pull-left" {if visibility === 'loggedin'} checked="checked"{/if}/>
+                <i class="icon-oae-loggedin pull-left"></i>
+                <span>${oae.data.me.tenant.displayName|encodeForHTML}</span>
+            </label>
+        </div>
+        <div class="radio">
+            <label>
+                <input type="radio" value="public" name="setpermissions-visibility" class="pull-left" {if visibility === 'public'} checked="checked"{/if}/>
+                <i class="icon-oae-public pull-left"></i>
+                <span>__MSG__PUBLIC__</span>
+            </label>
+        </div>
+
+        <h4>__MSG__SHARE_WITH__</h4>
+        <input type="text" id="setpermissions-share" placeholder="__MSG__ENTER_NAME_HERE__"/>
+
+        <div id="setpermissions-footer" class="modal-footer">
+            <button type="button" id="setpermissions-cancelpermissions" class="btn btn-link pull-left">__MSG__CANCEL__</button>
+            <button type="submit" id="setpermissions-savepermissions" class="btn btn-primary pull-right">__MSG__UPDATE__</button>
+        </div>
+    </form>
 --></div>
 
 <div id="setpermissions-summary-template"><!--
diff --git a/node_modules/oae-core/share/css/share.css b/node_modules/oae-core/share/css/share.css
index 9e7df160e2f..5dc4b4a5693 100644
--- a/node_modules/oae-core/share/css/share.css
+++ b/node_modules/oae-core/share/css/share.css
@@ -23,3 +23,17 @@
     padding-bottom: 0;
     padding-right: 0;
 }
+
+.oae-lhnavigation .nav-list .popover [class^="icon-"] {
+    margin-right: 0;
+    top: 0;
+    width: auto;
+}
+
+
+/* iPhone resolution */
+@media only screen and (min-device-width : 320px) and (max-device-width : 480px) {
+    #share-container {
+        width: 250px;
+    }
+}
diff --git a/node_modules/oae-core/share/js/share.js b/node_modules/oae-core/share/js/share.js
index 38f7a47442a..f7c45efd8b8 100755
--- a/node_modules/oae-core/share/js/share.js
+++ b/node_modules/oae-core/share/js/share.js
@@ -189,11 +189,12 @@ define(['jquery', 'oae.core'], function($, oae) {
                 oae.api.util.clickover($trigger, $('.share-widget'), {
                     'onShown': function($currentRootEl) {
                         $rootel = $currentRootEl;
-                        getContext();
                         // Work around a Chrome bug (https://code.google.com/p/chromium/issues/detail?id=268718) where
-                        // it sometimes forgets to update z-index by forcing a repaint.
-                        // @see https://github.com/oaeproject/3akai-ux/pull/3436 Share popover behind youtube video
+                        // it sometimes forgets to update z-index by forcing a repaint. Without the workaround, the share
+                        // popover will be displaybed behind a content preview that uses an iframe.
+                        // @see https://github.com/oaeproject/3akai-ux/pull/3436
                         $rootel[0].style.webkitTransform = 'scale(1)';
+                        getContext();
                     }
                 });
             });
diff --git a/node_modules/oae-core/termsandconditions/css/termsandconditions.css b/node_modules/oae-core/termsandconditions/css/termsandconditions.css
index d42e0be066f..4adfc2cb842 100644
--- a/node_modules/oae-core/termsandconditions/css/termsandconditions.css
+++ b/node_modules/oae-core/termsandconditions/css/termsandconditions.css
@@ -13,9 +13,17 @@
  * permissions and limitations under the License.
  */
 
-#termsandconditions-modal {
-    width: 960px;
-    margin-left: -480px;
+@media (min-width: 769px) and (max-width: 920px) {
+    #termsandconditions-modal .modal-dialog {
+        margin: 0 10px;
+        width: auto;
+    }
+}
+
+@media (min-width: 920px) {
+    #termsandconditions-modal .modal-dialog {
+        width: 900px;
+    }
 }
 
 #termsandconditions-modal .well {
diff --git a/node_modules/oae-core/termsandconditions/termsandconditions.html b/node_modules/oae-core/termsandconditions/termsandconditions.html
index d957476e75c..16aadca7e67 100644
--- a/node_modules/oae-core/termsandconditions/termsandconditions.html
+++ b/node_modules/oae-core/termsandconditions/termsandconditions.html
@@ -2,13 +2,17 @@
 <link rel="stylesheet" type="text/css" href="css/termsandconditions.css" />
 
 <!-- MODAL -->
-<div id="termsandconditions-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="termsandconditions-modal-title" aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
-        <h3 id="termsandconditions-modal-title">__MSG__TERMS_AND_CONDITIONS__</h3>
+<div id="termsandconditions-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="termsandconditions-modal-title" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
+                <h3 id="termsandconditions-modal-title">__MSG__TERMS_AND_CONDITIONS__</h3>
+            </div>
+            <div class="modal-body"><!-- --></div>
+            <div class="modal-footer"><!-- --></div>
+        </div>
     </div>
-    <div class="modal-body"><!-- --></div>
-    <div class="modal-footer"><!-- --></div>
 </div>
 
 <!-- Container used for accepting the terms and conditions -->
diff --git a/node_modules/oae-core/topnavigation/css/topnavigation.css b/node_modules/oae-core/topnavigation/css/topnavigation.css
index a4beab8165e..8240d1cecf2 100755
--- a/node_modules/oae-core/topnavigation/css/topnavigation.css
+++ b/node_modules/oae-core/topnavigation/css/topnavigation.css
@@ -32,46 +32,69 @@
     text-decoration: none;
 }
 
+#topnavigation-loginlogout-container {
+    max-width: 100px;
+    padding: 0 0 0 34px;
+}
+
+#topnavigation-loginlogout-container #topnavigation-signout {
+    padding: 23px 0;
+}
+
 /** SEARCH **/
 
 #topnavigation-search-form {
-    margin-bottom: 0px;
-    margin-right: 32px;
+    margin-top: 18px;
 }
 
 #topnavigation-search-form #topnavigation-search-query {
+    display: inline;
     padding-right: 30px;
 }
 
 #topnavigation-search-form #topnavigation-search-icon {
-    margin-left: -30px;
-    margin-top: 2px;
+    margin-left: -27px;
+    margin-top: 7px;
     padding: 0px;
     opacity: 0.6;
 }
 
+/* On smaller resolutions the search box is hidden and the margin on the search icon needs to be changed */
+@media (max-width: 991px) {
+    #topnavigation-search-form #topnavigation-search-icon {
+        margin-left: 3px;
+    }
+}
+
 #topnavigation-search-form #topnavigation-search-icon i {
     font-size: 18px;
 }
 
 /** SIGN IN DROPDOWN **/
+#topnavigation-signin-dropdown .row {
+    margin: 0;
+}
 
 .topnavigation-signin-dropdown-single {
-    width: 220px;
+    line-height: 1;
 }
 
 .topnavigation-signin-dropdown-double {
-    width: 475px;
+    line-height: 1;
+    margin-top: -15px;
+}
+
+#topnavigation-signin-form {
+    width: 207px;
 }
 
 .topnavigation-signin-dropdown-double #topnavigation-signin-external {
-    padding: 10px 5px 10px 0;
+    padding: 10px 0 10px;
 }
 
 .topnavigation-signin-dropdown-double #topnavigation-signin-internal {
-    margin-left: 0px;
-    border-left: 1px dotted #D4D4D4;
-    padding-left: 15px;
+    margin-left: 0;
+    padding: 0;
 }
 
 #topnavigation-signin-dropdown #topnavigation-login-actions {
@@ -106,3 +129,29 @@
 #topnavigation-signin-dropdown .btn-auth.btn-shibboleth:before {
     background: none;
 }
+
+@media (min-width: 992px) {
+    .topnavigation-signin-dropdown-double {
+        width: 500px;
+    }
+
+    .topnavigation-signin-dropdown-double #topnavigation-signin-internal {
+        border-left: 1px dotted #D4D4D4;
+        padding: 0 15px;
+    }
+
+    .topnavigation-signin-dropdown-double #topnavigation-signin-external {
+        padding-right: 5px;
+    }
+}
+
+/* iPad resolution */
+@media only screen and (min-device-width : 768px) and (max-device-width : 1024px) {
+    .topnavigation-logged-out #topnavigation-search-form #topnavigation-search-query {
+        display: none !important;
+    }
+
+    .topnavigation-logged-out #topnavigation-search-form #topnavigation-search-icon {
+        margin-left: 3px;
+    }
+}
diff --git a/node_modules/oae-core/topnavigation/js/topnavigation.js b/node_modules/oae-core/topnavigation/js/topnavigation.js
index 61b08a44619..c02c9841cef 100755
--- a/node_modules/oae-core/topnavigation/js/topnavigation.js
+++ b/node_modules/oae-core/topnavigation/js/topnavigation.js
@@ -38,8 +38,8 @@ define(['jquery', 'oae.core'], function($, oae) {
          * users
          */
         var initLeftMenu = function() {
-            var template = oae.data.me.anon ? '#topnavigation-left-anonymous-template' : '#topnavigation-left-loggedin-template';
-            oae.api.util.template().render(template, null, $('#topnavigation-left', $rootel));
+            var $template = oae.data.me.anon ? $('#topnavigation-left-anonymous-template') : $('#topnavigation-left-loggedin-template');
+            oae.api.util.template().render($template, null, $('#topnavigation-left', $rootel));
         };
 
         /**
@@ -47,9 +47,9 @@ define(['jquery', 'oae.core'], function($, oae) {
          * and Sign in dropdown. For logged in users, this will show the logout button
          */
         var initRightMenu = function() {
-            var template = oae.data.me.anon ? '#topnavigation-right-anonymous-template' : '#topnavigation-right-loggedin-template';
-            // Append as the search bar will already be there
-            $('#topnavigation-right', $rootel).append(oae.api.util.template().render(template));
+            var $template = oae.data.me.anon ? $('#topnavigation-right-anonymous-template') : $('#topnavigation-right-loggedin-template');
+            // Render login/logout
+            oae.api.util.template().render($template, null, $('#topnavigation-loginlogout-container', $rootel));
         };
 
 
@@ -131,6 +131,10 @@ define(['jquery', 'oae.core'], function($, oae) {
          * redirected to the search page using the entered search query
          */
         var setUpSearch = function() {
+            if (oae.data.me.anon) {
+                $('#topnavigation-container', $rootel).addClass('topnavigation-logged-out');
+            }
+
             $(document).on('submit', '#topnavigation-search-form', function() {
                 var query = $.trim($('#topnavigation-search-query', $(this)).val());
                 window.location = '/search/' + oae.api.util.security().encodeForURL(query);
diff --git a/node_modules/oae-core/topnavigation/topnavigation.html b/node_modules/oae-core/topnavigation/topnavigation.html
index 26c231a1851..d840b042fa1 100755
--- a/node_modules/oae-core/topnavigation/topnavigation.html
+++ b/node_modules/oae-core/topnavigation/topnavigation.html
@@ -9,25 +9,30 @@
         <button id="topnavigation-scroll-to-top" class="oae-link-button hide" title="__MSG__SCROLL_TO_TOP__" accesskey="s"></button>
     </div>
     <!-- NAVIGATION -->
-    <div class="row-fluid">
+    <div class="row">
         <!-- LEFT MENU -->
-        <div id="topnavigation-left" class="span5"><!-- --></div>
+        <div id="topnavigation-left" class="col-xs-6 col-sm-5"><!-- --></div>
         <!-- LOGO -->
-        <div id="topnavigation-center" class="span2 text-center">
+        <div id="topnavigation-center" class="col-sm-2 col-xs-0 hidden-xs visible-sm text-center">
             <a href="/" class="oae-institutional-logo" title="__MSG__OAE__">
                 <span class="oae-aural-text">__MSG__OAE__</span>
             </a>
         </div>
         <!-- RIGHT MENU -->
-        <div id="topnavigation-right" class="span5 text-right">
+        <div id="topnavigation-right" class="col-xs-6 col-sm-5 col-md-5">
+            <div id="topnavigation-loginlogout-container" class="pull-right"><!-- --></div>
             <!-- SEARCH -->
-            <form id="topnavigation-search-form" class="navbar-search" role="search" aria-label="__MSG__TOPNAV_SEARCH_ARIA_LABEL__">
-                <label for="topnavigation-search-query" class="oae-aural-text">__MSG__SEARCH__</label>
-                <input type="text" id="topnavigation-search-query" class="search-query" title="__MSG__SEARCH_FOR_CONTENT_PEOPLE_GROUPS__"/>
-                <button type="submit" id="topnavigation-search-icon" class="btn btn-link">
-                    <i class="icon-search"><span class="oae-aural-text">__MSG__SEARCH__</span></i>
-                </button>
-            </form>
+            <div class="col-md-8 pull-right">
+                <form id="topnavigation-search-form" class="form-horizontal navbar-search" role="search" aria-label="__MSG__TOPNAV_SEARCH_ARIA_LABEL__">
+                    <div class="form-group">
+                        <label for="topnavigation-search-query" class="control-label oae-aural-text">__MSG__SEARCH__</label>
+                        <input type="text" id="topnavigation-search-query" class="hidden-xs hidden-sm search-query form-control pull-left" title="__MSG__SEARCH_FOR_CONTENT_PEOPLE_GROUPS__"/>
+                        <button type="submit" id="topnavigation-search-icon" class="btn btn-link pull-left">
+                            <i class="icon-search"><span class="oae-aural-text">__MSG__SEARCH__</span></i>
+                        </button>
+                    </div>
+                </form>
+            </div>
         </div>
     </div>
 </div>
@@ -54,15 +59,15 @@ <h1 id="topnavigation-target" class="oae-aural-text">__MSG__SKIP_MENU_TARGET__</
                            oae.api.config.getValue('oae-authentication', 'cas', 'enabled') ||
                            oae.api.config.getValue('oae-authentication', 'shibboleth', 'enabled')}
 
-    <ul class="pull-right inline topnavigation-menu-buttons">
+    <ul class="pull-right list-inline topnavigation-menu-buttons">
         <li class="dropdown">
             <button type="button" id="topnavigation-signin" class="btn btn-link dropdown-toggle" data-toggle="dropdown">__MSG__SIGN_IN__</button>
 
             <div id="topnavigation-signin-dropdown" class="dropdown-menu pull-right text-left {if hasLocalAuth && hasRedirectAuth} topnavigation-signin-dropdown-double {else} topnavigation-signin-dropdown-single {/if}">
-                <div class="row-fluid">
+                <div class="row">
                     {if hasRedirectAuth}
-                        <div id="topnavigation-signin-external" class="{if hasLocalAuth && hasRedirectAuth} span6 {else} span12 {/if} text-center">
-                            <ul class="inline">
+                        <div id="topnavigation-signin-external" class="{if hasLocalAuth && hasRedirectAuth}col-xs-12 col-sm-12 col-md-6 {else}col-xs-12 col-sm-12 col-md-12 {/if} text-center">
+                            <ul class="list-unstyled">
                                 {if oae.api.config.getValue('oae-authentication', 'facebook', 'enabled')}
                                     <li>
                                         <a class="btn-auth btn-facebook" href="/api/auth/facebook">
@@ -104,15 +109,15 @@ <h1 id="topnavigation-target" class="oae-aural-text">__MSG__SKIP_MENU_TARGET__</
                         </div>
                     {/if}
                     {if hasLocalAuth}
-                        <div id="topnavigation-signin-internal" class="{if hasLocalAuth && hasRedirectAuth} span6 {else} span12 {/if}">
-                            <form id="topnavigation-signin-form">
-                                <div class="control-group">
+                        <div id="topnavigation-signin-internal" class="{if hasLocalAuth && hasRedirectAuth}col-xs-12 col-sm-12 col-md-6 {else}col-xs-12 col-sm-12 col-md-12 {/if}">
+                            <form id="topnavigation-signin-form" role="form">
+                                <div class="form-group">
                                     <label for="topnavigation-signin-username" class="control-label">__MSG__USERNAME__</label>
-                                    <input id="topnavigation-signin-username" name="topnavigation-signin-username" type="text" class="input-block-level required" maxlength="255">
+                                    <input id="topnavigation-signin-username" name="topnavigation-signin-username" type="text" autocapitalize="off" autocorrect="off" class="form-control required" maxlength="255">
                                 </div>
-                                <div class="control-group">
+                                <div class="form-group">
                                     <label for="topnavigation-signin-password" class="control-label">__MSG__PASSWORD__</label>
-                                    <input id="topnavigation-signin-password" name="topnavigation-signin-password" type="password" class="input-block-level required" maxlength="255">
+                                    <input id="topnavigation-signin-password" name="topnavigation-signin-password" type="password" class="form-control required" maxlength="255">
                                 </div>
                                 <div id="topnavigation-login-actions">
                                     <button id="topnavigation-signin-button" class="btn btn-primary pull-right" type="submit">__MSG__SIGN_IN__</button>
@@ -139,7 +144,7 @@ <h1 id="topnavigation-target" class="oae-aural-text">__MSG__SKIP_MENU_TARGET__</
 -->
 
 <div id="topnavigation-left-loggedin-template"><!--
-    <ul class="inline topnavigation-menu-buttons" role="menubar">
+    <ul class="list-inline topnavigation-menu-buttons" role="menubar">
         <li>
             <a href="/me" class="btn btn-link" title="__MSG__HOME__" role="menuitem">
                 <i class="icon-home"><span class="oae-aural-text">__MSG__HOME__</span></i>
@@ -155,7 +160,7 @@ <h1 id="topnavigation-target" class="oae-aural-text">__MSG__SKIP_MENU_TARGET__</
 --></div>
 
 <div id="topnavigation-right-loggedin-template"><!--
-    <button type="button" id="topnavigation-signout" class="btn btn-link" title="__MSG__SIGN_OUT__">
+    <button type="button" id="topnavigation-signout" class="btn btn-link pull-right" title="__MSG__SIGN_OUT__">
         <i class="icon-signout"><span class="oae-aural-text">__MSG__SIGN_OUT__</span></i>
     </button>
 --></div>
diff --git a/node_modules/oae-core/unfollow/css/unfollow.css b/node_modules/oae-core/unfollow/css/unfollow.css
index 2234ce4dcda..e51872ef71d 100644
--- a/node_modules/oae-core/unfollow/css/unfollow.css
+++ b/node_modules/oae-core/unfollow/css/unfollow.css
@@ -14,7 +14,7 @@
  */
 
 #unfollow-modal .well {
-    margin-bottom: 10px;
+    margin-bottom: 0;
     max-height: 238px;
     overflow: auto;
     padding: 10px;
@@ -24,6 +24,12 @@
     background-color: #FFF;
 }
 
-#unfollow-modal ul.oae-list .oae-listitem h3 {
+/* Add an IE9 fallback for threedots */
+.ie-lt10 #unfollow-modal ul.oae-list .oae-listitem h3 {
     max-width: 400px;
 }
+
+#unfollow-modal .oae-listitem .oae-listitem-actions {
+    margin-left: 7px;
+    width: auto;
+}
diff --git a/node_modules/oae-core/unfollow/unfollow.html b/node_modules/oae-core/unfollow/unfollow.html
index a72f8732e0a..db6730247a2 100644
--- a/node_modules/oae-core/unfollow/unfollow.html
+++ b/node_modules/oae-core/unfollow/unfollow.html
@@ -3,16 +3,20 @@
 
 <!-- MODAL -->
 <div id="unfollow-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="unfollow-modal-title" aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
-        <h3 id="createlink-modal-title">__MSG__UNFOLLOW__</h3>
-    </div>
-    <div class="modal-body">
-        <div id="unfollow-list-container"><!-- --></div>
-    </div>
-    <div class="modal-footer">
-        <button class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
-        <button id="unfollow-unfollow" class="btn btn-danger pull-right" aria-hidden="true">__MSG__UNFOLLOW__</button>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
+                <h3 id="createlink-modal-title">__MSG__UNFOLLOW__</h3>
+            </div>
+            <div class="modal-body">
+                <div id="unfollow-list-container"><!-- --></div>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
+                <button id="unfollow-unfollow" class="btn btn-danger pull-right" aria-hidden="true">__MSG__UNFOLLOW__</button>
+            </div>
+        </div>
     </div>
 </div>
 
@@ -30,20 +34,20 @@ <h4>__MSG__ARE_YOU_SURE_YOU_WANT_TO_UNFOLLOW_THIS_USER__</h4>
                 <li class="oae-list-item" data-id="${user.id}">
                     <div class="oae-list-compact-item">
                         <div class="oae-listitem oae-listitem-compact">
-                            <div class="oae-listitem-actions pull-right">
-                                <i class="icon-spinner icon-spin">
-                                    <span class="oae-aural-text">__MSG__UNFOLLOWING_USER__</span>
-                                </i>
-                                <i class="icon-ok hide">
-                                    <span class="oae-aural-text">__MSG__UNFOLLOWING_SUCCEEDED__</span>
-                                </i>
-                                <i class="icon-warning-sign hide">
-                                    <span class="oae-aural-text">__MSG__UNFOLLOWING_FAILED__</span>
-                                </i>
-                            </div>
                             ${renderThumbnail(user)}
                             <div>
                                 <h3 class="oae-threedots">${displayName}</h3>
+                                <div class="oae-listitem-actions">
+                                    <i class="icon-spinner icon-spin">
+                                        <span class="oae-aural-text">__MSG__UNFOLLOWING_USER__</span>
+                                    </i>
+                                    <i class="icon-ok hide">
+                                        <span class="oae-aural-text">__MSG__UNFOLLOWING_SUCCEEDED__</span>
+                                    </i>
+                                    <i class="icon-warning-sign hide">
+                                        <span class="oae-aural-text">__MSG__UNFOLLOWING_FAILED__</span>
+                                    </i>
+                                </div>
                             </div>
                         </div>
                     </div>
diff --git a/node_modules/oae-core/upload/css/upload.css b/node_modules/oae-core/upload/css/upload.css
index b56afcaae77..0eed92fdd10 100644
--- a/node_modules/oae-core/upload/css/upload.css
+++ b/node_modules/oae-core/upload/css/upload.css
@@ -38,10 +38,25 @@
 }
 
 #upload-modal .upload-selected-name {
+    -webkit-flex: 10;
+       -moz-flex: 10;
+        -ms-flex: 10;
+            flex: 10;
     line-height: 25px;
+}
+
+/* Add an IE9 fallback for threedots */
+.ie-lt10 #upload-modal .upload-selected-name {
     max-width: 350px;
 }
 
+#upload-modal .oae-listitem .oae-listitem-actions {
+    -webkit-flex: 2;
+       -moz-flex: 2;
+        -ms-flex: 2;
+            flex: 2;
+}
+
 #upload-modal ul#upload-selected-container {
     max-height: 230px;
     overflow: auto;
@@ -49,8 +64,8 @@
 
 #upload-modal #upload-permissions {
     margin: 12px 0 0;
-    max-height: 88px;
-    overflow: hidden;
+    max-height: 140px;
+    overflow: auto;
 }
 
 #upload-modal #upload-permissions-summary > div {
@@ -71,5 +86,38 @@
     margin-top: -4px;
     outline: none;
     padding: 0;
-    width: 370px !important;
+}
+
+.ie-lt10 #upload-modal .upload-selected-name.jeditable-field form input {
+    max-width: 370px !important;
+}
+
+.ie-lt10 #upload-modal .oae-listitem-actions {
+    width: auto;
+}
+
+#upload-modal .oae-listitem.oae-listitem-compact > div:not(.oae-thumbnail) {
+    -webkit-flex-direction: row-reverse;
+       -moz-flex-direction: row-reverse;
+        -ms-flex-direction: row-reverse;
+            flex-direction: row-reverse;
+}
+
+/* Add an IE9 fallback for threedots */
+@media (min-width: 550px) {
+    .ie-lt10 .upload-selected-name {
+        max-width: 375px !important;
+    }
+}
+
+@media (min-width: 400px) and (max-width: 550px) {
+    .ie-lt10 .upload-selected-name {
+        max-width: 220px !important;
+    }
+}
+
+@media (max-width: 400px) {
+    .ie-lt10 .upload-selected-name {
+        max-width: 140px !important;
+    }
 }
diff --git a/node_modules/oae-core/upload/js/upload.js b/node_modules/oae-core/upload/js/upload.js
index 06d422c0d63..eb7e5dfc86c 100644
--- a/node_modules/oae-core/upload/js/upload.js
+++ b/node_modules/oae-core/upload/js/upload.js
@@ -124,7 +124,8 @@ define(['jquery', 'oae.core', 'jquery.fileupload', 'jquery.iframe-transport', 'j
          * @param  {Number}   progress   Number between 0 and 100 indicating the upload progress
          */
         var updateProgress = function(progress) {
-            $('.bar', $rootel).css('width', progress + '%');
+            $('.progress-bar', $rootel).css('width', progress + '%');
+            $('.progress-bar', $rootel).attr('aria-valuenow', Math.round(progress) + '%');
         };
 
         /**
@@ -212,7 +213,7 @@ define(['jquery', 'oae.core', 'jquery.fileupload', 'jquery.iframe-transport', 'j
         var showPermissions = function() {
             // Hide all containers
             $('#upload-modal .modal-body > div', $rootel).hide();
-            $('#upload-modal > .modal-footer', $rootel).hide();
+            $('#upload-modal .modal-content > .modal-footer', $rootel).hide();
             // Show the permissions container
             $('#upload-modal .modal-body > div#upload-permissions-container', $rootel).show();
             $('#upload-upload', $rootel).hide();
@@ -225,7 +226,7 @@ define(['jquery', 'oae.core', 'jquery.fileupload', 'jquery.iframe-transport', 'j
             // Hide all containers
             $('#upload-modal .modal-body > div', $rootel).hide();
             // Show the overview container
-            $('#upload-modal > .modal-footer', $rootel).show();
+            $('#upload-modal .modal-content > .modal-footer', $rootel).show();
             $('#upload-modal .modal-body > div#upload-overview-container', $rootel).show();
             $('#upload-permissions', $rootel).show();
             $('#upload-upload', $rootel).show();
@@ -265,7 +266,7 @@ define(['jquery', 'oae.core', 'jquery.fileupload', 'jquery.iframe-transport', 'j
          * Reset the widget when the modal dialog is closed
          */
         var setUpReset = function() {
-            $('#upload-modal').on('hidden', function(ev) {
+            $('#upload-modal').on('hidden.bs.modal', function(ev) {
                 // Bootstrap will send out a `hidden` event when certain components are destroyed.
                 // We can only reset the widget when the modal is closed though.
                 // e.g. `$('[rel="tooltip"]', $rootel).tooltip('destroy');`
@@ -482,6 +483,11 @@ define(['jquery', 'oae.core', 'jquery.fileupload', 'jquery.iframe-transport', 'j
          * Initializes the upload modal dialog
          */
         var setUpUploadModal = function() {
+            // Hide the drag and drop text when on mobile
+            if (oae.api.util.isHandheldDevice()) {
+                $('#upload-drop-text', $rootel).hide();
+            }
+
             $(document).on('click', '.oae-trigger-upload', function() {
                 $('#upload-modal', $rootel).modal({
                     'backdrop': 'static'
@@ -497,14 +503,17 @@ define(['jquery', 'oae.core', 'jquery.fileupload', 'jquery.iframe-transport', 'j
                 $('#upload-modal', $rootel).modal({
                     'backdrop': 'static'
                 });
-                showOverview();
-                showDropped(data);
+                if (data) {
+                    showOverview();
+                    showDropped(data);
+                } else {
+                    showDropzone();
+                    setUpUploadField();
+                }
             });
 
             // Binds the 'change' button that shows the setpermissions widget
-            $('#upload-change-permissions', $rootel).on('click', function() {
-                showPermissions();
-            });
+            $('#upload-change-permissions', $rootel).on('click', showPermissions);
 
             // Receive the context information and cache it
             $(document).on('oae.context.send.upload', function(ev, ctx) {
diff --git a/node_modules/oae-core/upload/upload.html b/node_modules/oae-core/upload/upload.html
index 04946ee1a61..892434d4044 100644
--- a/node_modules/oae-core/upload/upload.html
+++ b/node_modules/oae-core/upload/upload.html
@@ -2,37 +2,41 @@
 <link rel="stylesheet" type="text/css" href="css/upload.css" />
 
 <!-- MODAL -->
-<div id="upload-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="upload-modal-title" aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
-        <h3 id="upload-modal-title">__MSG__UPLOAD_FILES__</h3>
-    </div>
-    <div class="modal-body">
-        <div id="upload-dropzone" class="well text-center hide">
-            <form>
-                __MSG__DROP_FILES_TO_UPLOAD__ <br/>__MSG__OR__<br/>
-                <span id="upload-browse-button" class="btn">
-                    <span>__MSG__BROWSE__</span>
-                    <label for="upload-input" class="oae-aural-text">__MSG__BROWSE__</label>
-                    <input id="upload-input" type="file" multiple="" name="file">
-                </span>
-            </form>
-        </div>
-        <div id="upload-overview-container" class="hide">
-            <ul id="upload-selected-container" class="oae-list oae-list-compact"><!-- --></ul>
-            <div id="upload-permissions" class="well">
-                <button id="upload-change-permissions" class="btn pull-right">__MSG__CHANGE__</button>
-                <div id="upload-permissions-summary"></div>
+<div id="upload-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="upload-modal-title" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
+                <h3 id="upload-modal-title">__MSG__UPLOAD_FILES__</h3>
+            </div>
+            <div class="modal-body">
+                <div id="upload-dropzone" class="well text-center hide">
+                    <form role="form">
+                        <span id="upload-drop-text">__MSG__DROP_FILES_TO_UPLOAD__ <br/>__MSG__OR__<br/></span>
+                        <span id="upload-browse-button" class="btn">
+                            <span>__MSG__BROWSE__</span>
+                            <label for="upload-input" class="oae-aural-text">__MSG__BROWSE__</label>
+                            <input id="upload-input" type="file" multiple="" name="file"/>
+                        </span>
+                    </form>
+                </div>
+                <div id="upload-overview-container" class="hide">
+                    <ul id="upload-selected-container" class="oae-list oae-list-compact"><!-- --></ul>
+                    <div id="upload-permissions" class="well">
+                        <button id="upload-change-permissions" class="btn pull-right">__MSG__CHANGE__</button>
+                        <div id="upload-permissions-summary"><!-- --></div>
+                    </div>
+                </div>
+                <div id="upload-permissions-container" class="text-left hide"><!-- --></div>
+            </div>
+            <div class="modal-footer">
+                <div class="progress hide">
+                    <div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
+                </div>
+                <button type="button" class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
+                <button type="button" id="upload-upload" class="btn btn-primary pull-right hide">__MSG__UPLOAD_FILES__</button>
             </div>
         </div>
-        <div id="upload-permissions-container" class="text-left hide"></div>
-    </div>
-    <div class="modal-footer">
-        <div class="progress hide">
-            <div class="bar"></div>
-        </div>
-        <button class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
-        <button id="upload-upload" class="btn btn-primary pull-right hide">__MSG__UPLOAD_FILES__</button>
     </div>
 </div>
 
@@ -41,25 +45,25 @@ <h3 id="upload-modal-title">__MSG__UPLOAD_FILES__</h3>
         {var fileName = oae.api.util.security().encodeForHTML(file.displayName)}
         <li class="oae-list-item" tabindex="${file_index}">
             <div class="oae-list-compact-item">
-                <div class="oae-listitem oae-listitem-compact">
+                <div class="clearfix oae-listitem oae-listitem-compact">
                     <div class="oae-thumbnail icon-oae-file icon-oae-content"></div>
-                    <div class="pull-left">
+                    <div>
+                        <div class="oae-listitem-actions pull-right">
+                            <i class="icon-spinner icon-spin">
+                                <span class="oae-aural-text">__MSG__UPLOADING_FILE__</span>
+                            </i>
+                            <i class="icon-ok hide">
+                                <span class="oae-aural-text">__MSG__FILE_UPLOAD_SUCCESS__</span>
+                            </i>
+                            <i class="icon-warning-sign hide">
+                                <span class="oae-aural-text">__MSG__FILE_UPLOAD_FAILED__</span>
+                            </i>
+                            <button type="button" class="btn btn-link upload-trash" title="__MSG__REMOVE_FROM_SELECTION__">
+                                <i class="icon-trash"><span class="oae-aural-text">__MSG__REMOVE_FROM_SELECTION__</span></i>
+                            </button>
+                        </div>
                         <div class="upload-selected-name oae-threedots jeditable-field" rel="tooltip" data-placement="right" data-original-title="__MSG__CLICK_TO_RENAME__" tabindex="0">${file.displayName|encodeForHTML}</div>
                     </div>
-                    <div class="oae-listitem-actions pull-right">
-                        <i class="icon-spinner icon-spin">
-                            <span class="oae-aural-text">__MSG__UPLOADING_FILE__</span>
-                        </i>
-                        <i class="icon-ok hide">
-                            <span class="oae-aural-text">__MSG__FILE_UPLOAD_SUCCESS__</span>
-                        </i>
-                        <i class="icon-warning-sign hide">
-                            <span class="oae-aural-text">__MSG__FILE_UPLOAD_FAILED__</span>
-                        </i>
-                        <button type="button" class="btn btn-link upload-trash" title="__MSG__REMOVE_FROM_SELECTION__">
-                            <i class="icon-trash"><span class="oae-aural-text">__MSG__REMOVE_FROM_SELECTION__</span></i>
-                        </button>
-                    </div>
                 </div>
             </div>
         </li>
diff --git a/node_modules/oae-core/uploadnewversion/js/uploadnewversion.js b/node_modules/oae-core/uploadnewversion/js/uploadnewversion.js
index 0f70e41dea6..8f6364519a1 100644
--- a/node_modules/oae-core/uploadnewversion/js/uploadnewversion.js
+++ b/node_modules/oae-core/uploadnewversion/js/uploadnewversion.js
@@ -64,7 +64,8 @@ define(['jquery', 'oae.core', 'jquery.fileupload', 'jquery.iframe-transport'], f
          * @param  {Number}   progress   Number between 0 and 100 indicating the upload progress
          */
         var updateProgress = function(progress) {
-            $('.bar', $rootel).css('width', progress + '%');
+            $('.progress-bar', $rootel).css('width', progress + '%');
+            $('.progress-bar', $rootel).attr('aria-valuenow', Math.round(progress) + '%');
         };
 
         /**
@@ -158,7 +159,7 @@ define(['jquery', 'oae.core', 'jquery.fileupload', 'jquery.iframe-transport'], f
                     );
                 } else {
                     $(document).trigger('oae.content.update', updatedContent);
-                    // If we need an iframe for the upload, progress will probably not be supported.
+                    // If we need an iframe for the upload, progress will probably not be supported
                     if (!useIframeTransport) {
                         updateProgress(100);
                     }
@@ -177,6 +178,11 @@ define(['jquery', 'oae.core', 'jquery.fileupload', 'jquery.iframe-transport'], f
          * Initializes the upload new version modal dialog
          */
         var initUploadNewVersionModal = function() {
+            // Hide the drag and drop text when on mobile
+            if (oae.api.util.isHandheldDevice()) {
+                $('#uploadnewversion-drop-text', $rootel).hide();
+            }
+
             $(document).on('click', '.oae-trigger-uploadnewversion', function() {
                 // Show the modal
                 $('#uploadnewversion-modal', $rootel).modal({
@@ -194,7 +200,7 @@ define(['jquery', 'oae.core', 'jquery.fileupload', 'jquery.iframe-transport'], f
             $('.icon-spinner' , $rootel).hide();
 
             // Reset the widget when it's fully hidden
-            $('#uploadnewversion-modal', $rootel).on('hidden', reset);
+            $('#uploadnewversion-modal', $rootel).on('hidden.bs.modal', reset);
         };
 
         initUploadNewVersionModal();
diff --git a/node_modules/oae-core/uploadnewversion/uploadnewversion.html b/node_modules/oae-core/uploadnewversion/uploadnewversion.html
index ca1cfc4e959..a758131ea61 100644
--- a/node_modules/oae-core/uploadnewversion/uploadnewversion.html
+++ b/node_modules/oae-core/uploadnewversion/uploadnewversion.html
@@ -2,34 +2,38 @@
 <link rel="stylesheet" type="text/css" href="css/uploadnewversion.css"/>
 
 <!-- MODAL -->
-<div id="uploadnewversion-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="uploadnewversion-modal-title" aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
-        <h3 id="uploadnewversion-modal-title">__MSG__UPLOAD_NEW_VERSION__</h3>
-    </div>
-    <form id="uploadnewversion-form">
-        <div class="modal-body">
-            <div id="uploadnewversion-dropzone" class="well text-center">
-                __MSG__DROP_NEW_VERSION_TO_UPLOAD__ <br/>__MSG__OR__<br/>
-                <span id="uploadnewversion-browse-button" class="btn">
-                    <span>__MSG__BROWSE__</span>
-                    <label for="uploadnewversion-input" class="oae-aural-text">__MSG__BROWSE__</label>
-                    <input id="uploadnewversion-input" type="file" name="file">
-                </span>
+<div id="uploadnewversion-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="uploadnewversion-modal-title" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&#215;</button>
+                <h3 id="uploadnewversion-modal-title">__MSG__UPLOAD_NEW_VERSION__</h3>
             </div>
-            <div id="uploadnewversion-progress" class="well text-center hide">
-                <div class="progress hide">
-                    <div class="bar"></div>
+            <form id="uploadnewversion-form" role="form">
+                <div class="modal-body">
+                    <div id="uploadnewversion-dropzone" class="well text-center">
+                        <span id="uploadnewversion-drop-text">__MSG__DROP_NEW_VERSION_TO_UPLOAD__ <br/>__MSG__OR__<br/></span>
+                        <span id="uploadnewversion-browse-button" class="btn">
+                            <span>__MSG__BROWSE__</span>
+                            <label for="uploadnewversion-input" class="oae-aural-text">__MSG__BROWSE__</label>
+                            <input id="uploadnewversion-input" type="file" name="file"/>
+                        </span>
+                    </div>
+                    <div id="uploadnewversion-progress" class="well text-center hide">
+                        <div class="progress hide">
+                            <div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
+                        </div>
+                        <i class="icon-spinner icon-spin">
+                            <span class="oae-aural-text">__MSG__UPLOADING__</span>
+                        </i>
+                    </div>
                 </div>
-                <i class="icon-spinner icon-spin">
-                    <span class="oae-aural-text">__MSG__UPLOADING__</span>
-                </i>
-            </div>
-        </div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
+                </div>
+            </form>
         </div>
-    </form>
+    </div>
 </div>
 
 <!-- JAVASCRIPT -->
diff --git a/shared/oae/api/oae.api.js b/shared/oae/api/oae.api.js
index 4ccd93ce282..2c5efa2054f 100644
--- a/shared/oae/api/oae.api.js
+++ b/shared/oae/api/oae.api.js
@@ -98,6 +98,14 @@ define(['oae.api.authentication', 'oae.api.config', 'oae.api.content', 'oae.api.
                                         throw new Error('Could not initialize the widgets API');
                                     }
 
+                                    // Add a `.ie-lt10` class to the html element that can be used for CSS fallbacks in IE9
+                                    // We can feature detect IE9 by checking for the unsupported `requestAnimationFrame` function
+                                    // TODO: Once we drop support for IE9 this can be removed
+                                    if (!window.requestAnimationFrame) {
+                                        $('html').addClass('ie-lt10');
+                                    }
+
+                                    // Set up the terms and conditions widget
                                     setUpTermsAndConditions();
 
                                     // The APIs have now fully initialized. All javascript that
@@ -131,7 +139,7 @@ define(['oae.api.authentication', 'oae.api.config', 'oae.api.content', 'oae.api.
         //////////////////////////
 
         /**
-         * Triggers the Terms and Conditions widget if the Terms and Conditions
+         * Trigger the Terms and Conditions widget if the Terms and Conditions
          * need to be accepted before using the system.
          */
         var setUpTermsAndConditions = function() {
diff --git a/shared/oae/api/oae.api.util.js b/shared/oae/api/oae.api.util.js
index 43e9652c47f..befb305d8d2 100755
--- a/shared/oae/api/oae.api.util.js
+++ b/shared/oae/api/oae.api.util.js
@@ -321,7 +321,7 @@ define(['exports', 'require', 'jquery', 'underscore', 'oae.api.config', 'jquery.
      * a close button for closing the notification. Notifications can be used as a confirmation message, error message, etc.
      *
      * This function is mostly just a wrapper around jQuery.bootstrap.notify.js and supports all of the options documented
-     * at http://nijikokun.github.com/bootstrap-notify/.
+     * at https://github.com/goodybag/bootstrap-notify.
      *
      * @param  {String}     [title]       The notification title
      * @param  {String}     message       The notification message that will be shown underneath the title. The message should be sanitized by the caller to allow for HTML inside of the notification
@@ -533,17 +533,17 @@ define(['exports', 'require', 'jquery', 'underscore', 'oae.api.config', 'jquery.
             };
 
             // Function that will be called when an invalid form field should be marked
-            // as invalid. In that case, we add an `error` class to the parent `control-group`
+            // as invalid. In that case, we add an `has-error` class to the parent `form-group`
             // element
             options.highlight = function($element) {
-                $($element).parents('.control-group').addClass('error');
+                $($element).parents('.form-group').addClass('has-error');
             };
 
             // Function that will be called when a form field should be marked no longer
-            // needs to be marked as invalid. In that case, we remove the `error` class from
-            // the parent `control-group` element
+            // needs to be marked as invalid. In that case, we remove the `has-error` class from
+            // the parent `form-group` element
             options.unhighlight = function($element) {
-                $($element).parents('.control-group').removeClass('error');
+                $($element).parents('.form-group').removeClass('has-error');
             };
 
             // We register the error placement handler. This will be called for each field that
@@ -557,7 +557,7 @@ define(['exports', 'require', 'jquery', 'underscore', 'oae.api.config', 'jquery.
                 $error.addClass('oae-error');
                 // Check if an error message placehold has been provided. If not, we default
                 // to a `help-block` display and insert it after the input field
-                var $helpPlaceholder = $('.help', $element.parents('.control-group'));
+                var $helpPlaceholder = $('.help', $element.parents('.form-group'));
                 if ($helpPlaceholder.length === 0) {
                     $error.addClass('help-block');
                     $error.insertAfter($element);
@@ -940,7 +940,7 @@ define(['exports', 'require', 'jquery', 'underscore', 'oae.api.config', 'jquery.
 
                 // Initialize the autoSuggest field
                 var $autoSuggest = $element.autoSuggest(options.url, options);
-                var $list = $autoSuggest.parents('ul');
+                var $list = $autoSuggest.parents('ul.as-selections');
 
                 // Remove the delete (x) button from the fixed fields
                 if (options.preFill) {
@@ -1244,4 +1244,26 @@ define(['exports', 'require', 'jquery', 'underscore', 'oae.api.config', 'jquery.
         $('body').show();
     };
 
+
+    ////////////////
+    // RESPONSIVE //
+    ////////////////
+
+    /**
+     * Check if the current browser is a browser on a mobile handheld device
+     *
+     * @return {Boolean}   `true` when using a mobile browser, `false` when using a desktop browser
+     */
+    var isHandheldDevice = exports.isHandheldDevice = function() {
+        var isHandheld = false;
+
+        _.each([navigator.userAgent || navigator.vendor || window.opera], function(a) {
+            if (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i.test(a) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0, 4))) {
+                isHandheld = true;
+            }
+        });
+
+        return isHandheld;
+    };
+
 });
diff --git a/shared/oae/api/oae.bootstrap.js b/shared/oae/api/oae.bootstrap.js
index f5c1740ce7e..4a86545ee90 100644
--- a/shared/oae/api/oae.bootstrap.js
+++ b/shared/oae/api/oae.bootstrap.js
@@ -25,7 +25,7 @@ requirejs.config({
         // Vendor paths
         'bootstrap': 'vendor/js/bootstrap',
         'bootstrap.clickover': 'vendor/js/bootstrap-plugins/bootstrapx.clickover',
-        'bootstrap.notify': 'vendor/js/bootstrap-plugins/bootstrap.notify',
+        'bootstrap.notify': 'vendor/js/bootstrap-plugins/bootstrap.notify.oae-edited',
         'globalize': 'vendor/js/l10n/globalize',
         'jquery.autosuggest': 'vendor/js/jquery-plugins/jquery.autoSuggest',
         'jquery.encoder': 'vendor/js/jquery-plugins/jquery.encoder',
@@ -61,6 +61,7 @@ requirejs.config({
         'jquery.infinitescroll': 'oae/js/jquery-plugins/jquery.infinitescroll',
         'jquery.jeditable-focus': 'oae/js/jquery-plugins/jquery.jeditable-focus',
         'jquery.list-options': 'oae/js/jquery-plugins/jquery.list-options',
+        'jquery.responsive': 'oae/js/jquery-plugins/jquery.responsive',
         'jquery.update-picture': 'oae/js/jquery-plugins/jquery.update-picture',
 
         // OAE API modules
diff --git a/shared/oae/api/oae.core.js b/shared/oae/api/oae.core.js
index 8bce7c86366..a167ffe339f 100644
--- a/shared/oae/api/oae.core.js
+++ b/shared/oae/api/oae.core.js
@@ -58,6 +58,7 @@ define([
         'jquery.dnd-upload',
         'jquery.infinitescroll',
         'jquery.list-options',
+        'jquery.responsive',
         'jquery.update-picture',
 
         /*!
diff --git a/shared/oae/css/oae.base.css b/shared/oae/css/oae.base.css
index 5efb5cf42e9..abb505c5d37 100644
--- a/shared/oae/css/oae.base.css
+++ b/shared/oae/css/oae.base.css
@@ -20,15 +20,23 @@
 /* FULL-WIDTH LAYOUT */
 
 body {
-    margin-left: 30px;
-    margin-right: 30px;
-    min-width: 920px;
+    padding-left: 30px;
+    padding-right: 30px;
+    min-width: 400px;
     display: none;
 }
 
+/* iPhone resolution */
+@media only screen and (min-device-width : 320px) and (max-device-width : 480px) {
+    body {
+        padding-left: 15px;
+        padding-right: 15px;
+    }
+}
+
 /* DEFAULT FONT AND TEXT STYLE */
 
-body, button, input, select, textarea {
+body, button, input, select, textarea, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
     font-family: 'Open Sans', arial, helvetica, sans-serif;
     line-height: 1.5;
 }
@@ -37,37 +45,50 @@ h1, h2, h3, h4, h5, h6 {
     font-weight: 600;
 }
 
+label {
+    font-weight: normal;
+    margin-bottom: 7px;
+}
+
 /* DEFAULT LINK STYLE */
 
 a:hover, .btn-link:hover, a:focus, .btn-link:focus {
     text-decoration: none;
 }
 
+/* DEFAULT BUTTON STYLE */
+
+.btn {
+    padding: 4px 12px;
+}
+
 /* NAVIGATION BAR
  * @see http://twitter.github.com/bootstrap/components.html#navs */
 
 .navbar-search {
-    display: inline;
     float: none;
 }
 
-.navbar-search .search-query:focus {
-    width: 250px;
-}
-
 /* NAVIGATION LIST
  * @see http://twitter.github.com/bootstrap/components.html#navs */
 
 .nav-list > li > a {
     padding-top: 8px;
     padding-bottom: 8px;
-    margin-bottom: 4px;
 }
 
 .nav > li > a:active {
     opacity: 0.8;
 }
 
+.nav-list > li > label {
+    padding: 0 15px;
+}
+
+.nav-list > li.nav-header {
+    padding: 0 15px;
+}
+
 .nav-list [class^="icon-"], .nav-list [class*=" icon-"] {
     display: inline-block;
     font-size: 1.5em;
@@ -147,6 +168,7 @@ a:hover, .btn-link:hover, a:focus, .btn-link:focus {
 
 .dropdown-menu form {
     margin-bottom: 5px;
+    margin-top: 5px;
 }
 
 /* FORMS
@@ -155,9 +177,6 @@ a:hover, .btn-link:hover, a:focus, .btn-link:focus {
 textarea,
 input[type="text"],
 input[type="password"] {
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-            box-sizing: border-box;
     min-height: 30px;
 }
 
@@ -180,38 +199,84 @@ input.search-query,
             border-radius: 3px;
 }
 
-.control-group select,
-.control-group textarea,
-.control-group input[type="text"],
-.control-group input[type="password"],
-.control-group input[type="datetime"],
-.control-group input[type="datetime-local"],
-.control-group input[type="date"],
-.control-group input[type="month"],
-.control-group input[type="time"],
-.control-group input[type="week"],
-.control-group input[type="number"],
-.control-group input[type="email"],
-.control-group input[type="url"],
-.control-group input[type="search"],
-.control-group input[type="tel"],
-.control-group input[type="color"],
-.control-group .uneditable-input {
+select,
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+    -webkit-border-radius: 4px;
+       -moz-border-radius: 4px;
+            border-radius: 4px;
+}
+
+.form-group:last-child {
     margin-bottom: 0;
 }
 
+.form-control {
+    padding: 6px;
+}
+
 .form-horizontal input + .help-block,
 .form-horizontal select + .help-block,
 .form-horizontal textarea + .help-block,
 .form-horizontal .uneditable-input + .help-block,
-.form-horizontal .input-prepend + .help-block,
-.form-horizontal .input-append + .help-block {
+.form-horizontal .input-group + .help-block {
     margin-top: 3px;
 }
 
+.has-error .form-control:-moz-placeholder {
+    color: #B94A48;
+}
+
+.has-error .form-control::-moz-placeholder {
+    color: #B94A48;
+}
+
+.has-error .form-control:-ms-input-placeholder {
+    color: #B94A48;
+}
+
+.has-error .form-control::-webkit-input-placeholder {
+    color: #B94A48;
+}
+
+.has-error .control-label h4 {
+    color: #B94A48;
+}
+
+.radio, .checkbox {
+    padding-left: 0;
+}
+
+.radio input[type="radio"],
+.radio-inline input[type="radio"],
+.checkbox input[type="checkbox"],
+.checkbox-inline input[type="checkbox"] {
+    margin-left: 0;
+    margin-right: 7px;
+}
+
 /* MODAL DIALOGS
  * @see http://twitter.github.com/bootstrap/javascript.html#modals */
 
+.modal-backdrop.in {
+    opacity: 0.8;
+    filter: alpha(opacity=80);
+}
+
 .modal {
     -webkit-border-radius: 4px;
        -moz-border-radius: 4px;
@@ -222,6 +287,23 @@ input.search-query,
             box-shadow: 0 0 6px #000;
 }
 
+.modal-dialog {
+    min-width: 300px;
+}
+
+@media screen and (min-width: 768px) {
+    .modal-dialog {
+        padding-top: 60px;
+    }
+}
+
+@media only screen and (max-device-width : 1024px) {
+    .modal-dialog {
+        margin-top: 0;
+        padding-top: 30px;
+    }
+}
+
 .modal .close[disabled]:hover {
     cursor: default;
     filter: alpha(opacity=20);
@@ -236,6 +318,8 @@ input.search-query,
 .modal-header h3 {
     font-size: 16px;
     font-weight: 200;
+    margin-bottom: 0;
+    margin-top: 5px;
 }
 
 .modal-body {
@@ -249,11 +333,17 @@ input.search-query,
     margin-top: 0;
 }
 
+.modal-body form,
+.modal-body label h4 {
+    margin: 0;
+}
+
 .modal-footer {
-    padding: 10px 25px 15px 15px;
     background-color: transparent;
     border-top: none;
     box-shadow: none;
+    margin-top: 0;
+    padding: 10px 25px 15px 15px;
 }
 
 /* CLICKOVER DIALOGS
@@ -272,10 +362,14 @@ input.search-query,
  * @see http://twitter.github.com/bootstrap/components.html#alerts
  * @see http://nijikokun.github.io/bootstrap-notify */
 
+.alert {
+    padding: 8px 35px 8px 14px;
+}
+
 .alert h4 {
     display: inline;
-    margin-right: 5px;
     font-size: 14px;
+    margin-right: 5px;
 }
 
 .notifications .alert {
@@ -310,7 +404,7 @@ input.search-query,
 .notifications.center > div,
 .notifications.bottom-center > div {
     margin: 0 auto;
-    max-width: 400px;
+    max-width: 600px;
     text-align: left;
     width: 100%;
     word-wrap: break-word;
@@ -370,7 +464,6 @@ ul.as-selections li.as-selection-item {
        -moz-box-shadow: none;
             box-shadow: none;
     font-family: inherit;
-    height: 30px;
     line-height: 30px;
     margin-bottom: 3px;
     margin-right: 5px;
@@ -398,6 +491,7 @@ ul.as-selections li.as-selection-item.as-fixed-item a.as-close {
 ul.as-selections li.as-selection-item.as-ghost-item {
     border: 1px dashed;
     cursor: pointer;
+    height: 38px;
 }
 
 ul.as-selections li.as-selection-item.as-ghost-item.as-ghost-selected {
@@ -425,10 +519,6 @@ ul.as-selections li.as-selection-item.as-ghost-item.as-ghost-selected a.as-close
 
 /* Suggested list items */
 
-.modal .as-results {
-    position: fixed;
-}
-
 ul.as-list {
     color: inherit;
     font-family: inherit;
@@ -449,7 +539,6 @@ ul.as-list li.as-result-item em {
     background-color: inherit;
     color: inherit;
     font-style: normal;
-    font-weight: 600;
     padding: 0;
 }
 
@@ -511,10 +600,19 @@ ul.as-list li.as-result-item.active {
        -moz-box-shadow: 0 2px 4px #DBDBDB;
             box-shadow: 0 2px 4px #DBDBDB;
     padding: 10px;
-    min-height: 450px;
+    min-height: 550px;
     clear: both;
 }
 
 .oae-main-content > div {
     clear: both;
 }
+
+/* Allow the content to overflow the body when navigation is expanded on smaller viewports */
+.oae-main-content > div:last-child {
+    overflow: hidden;
+}
+
+.oae-main-content > .row {
+    margin: 0 5px 0 -5px;
+}
diff --git a/shared/oae/css/oae.components.css b/shared/oae/css/oae.components.css
index 2e0ed503b01..1c6e1afe28e 100644
--- a/shared/oae/css/oae.components.css
+++ b/shared/oae/css/oae.components.css
@@ -93,7 +93,7 @@ a.oae-plain-link:hover {
  *   e.g. <div class="oae-panel-primary">...</div>
  */
 .oae-panel-primary, .oae-panel-secondary, .oae-panel-tertiary {
-    padding: 15px;
+    padding: 15px 25px;
     -webkit-border-radius: 5px;
        -moz-border-radius: 5px;
             border-radius: 5px;
@@ -138,9 +138,9 @@ i.icon-oae-public:before {
     color: #313131;
     display: inline-block;
     font-size: 15px;
-    width: 18px;
-    height: 16px;
-    padding-top: 1px;
+    width: 19px;
+    height: 19px;
+    padding-top: 2px;
     text-align: center;
 }
 
@@ -168,7 +168,7 @@ i[class^="icon-"].large {
 
 i[class^="icon-"].large:before {
     font-size: 50px;
-    height: 55px;
+    height: 60px;
     padding-top: 5px;
     width: 60px;
 }
@@ -184,60 +184,68 @@ i[class^="icon-"].large:before {
  * Each toggle button will have an icon, a name and a description. One of the toggle buttons will
  * selected at any time.
  *
- * TODO: This component needs to be more generic so the tick is always displayed in the middle, independent
- * of the width of the large option. https://github.com/oaeproject/3akai-ux/issues/2980
  *
- * e.g. <div class="oae-large-options-container row-fluid">
- *          <label for="oae-visibility-private" class="span4 text-center">
- *              <div class="oae-large-options well pull-left text-center checked">
- *                  <input type="radio" id="oae-visibility-private" value="private" name="oae-visibility-group" class="pull-left" checked="checked"/>
- *                  <i class="icon-oae-private large text-center"></i>
- *                  <span>__MSG__PRIVATE__</span>
- *              </div>
- *              <i class="icon-ok hide"></i>
- *              <small>__MSG__GROUP_PRIVATE_DESCRIPTION__</small>
- *          </label>
- *          <label for="oae-visibility-loggedin" class="span4 text-center">
- *              <div class="oae-large-options well pull-left text-center">
- *                  <input type="radio" id="oae-visibility-loggedin" value="loggedin" name="oae-visibility-group" class="pull-left"/>
- *                  <i class="icon-oae-loggedin large text-center"></i>
- *                  <span>Cambridge University</span>
- *              </div>
- *              <i class="icon-ok hide"></i>
- *              <small>__MSG__GROUP_LOGGEDIN_DESCRIPTION__</small>
- *          </label>
- *          <label for="oae-visibility-public" class="span4 text-center">
- *              <div class="oae-large-options well pull-left text-center">
- *                  <input type="radio" id="oae-visibility-public" value="public" name="oae-visibility-group" class="pull-left"/>
- *                  <i class="icon-oae-public large text-center"></i>
- *                  <span>__MSG__PUBLIC__</span>
- *              </div>
- *              <i class="icon-ok hide"></i>
- *              <small>__MSG__GROUP_PUBLIC_DESCRIPTION__</small>
- *          </label>
+ * e.g. <div class="oae-large-options-container row">
+ *          <div class="col-md-6 text-center">
+ *              <label for="oae-visibility-private" class="checked">
+ *                  <i class="icon-ok hide"></i>
+ *                  <div class="oae-large-options well">
+ *                      <input type="radio" id="oae-visibility-private" value="private" name="oae-visibility-group" class="pull-left" checked="checked" tabindex="0"/>
+ *                      <i class="icon-oae-private large text-center"></i>
+ *                      <span class="oae-threedots">__MSG__MEMBERS_ONLY__</span>
+ *                  </div>
+ *                  <small>__MSG__GROUP_PRIVATE_DESCRIPTION__</small>
+ *              </label>
+ *          </div>
+ *          <div class="col-md-6 text-center">
+ *              <label for="oae-visibility-loggedin">
+ *                  <i class="icon-ok hide"></i>
+ *                  <div class="oae-large-options well">
+ *                      <input type="radio" id="oae-visibility-loggedin" value="loggedin" name="oae-visibility-group" class="pull-left" tabindex="0"/>
+ *                      <i class="icon-oae-loggedin large text-center"></i>
+ *                      <span class="oae-threedots">${tenant}</span>
+ *                  </div>
+ *                  <small>__MSG__GROUP_LOGGEDIN_DESCRIPTION__</small>
+ *              </label>
+ *          </div>
  *      </div>
  *
  * Notes:
  *
- * - The selected button should have a `checked` class on the `oae-large-options` element
+ * - The selected button should have a `checked` class on the label element
+ * - col-md-x defines the width of the column. The total of all columns should be 12.
  **/
 
 .oae-large-options-container label {
+    cursor: pointer;
+    display: inline;
+}
+
+.oae-large-options-container label small {
+    display: block;
+    margin: 0 0 35px;
     position: relative;
 }
 
+.oae-large-options-container label.checked small {
+    margin: 0;
+    top: -35px;
+}
+
 .oae-large-options-container .oae-large-options {
     -webkit-box-sizing: border-box;
        -moz-box-sizing: border-box;
             box-sizing: border-box;
     height: 150px;
-    margin: 0 10px 15px 0;
     padding-top: 13px;
     width: 100%;
 }
 
-.oae-large-options-container label:last-child .oae-large-options {
-    margin-right: 0;
+.oae-large-options-container label.checked .oae-large-options {
+    border: 8px solid;
+    padding-top: 6px;
+    position: relative;
+    top: -35px;
 }
 
 .oae-large-options-container .oae-large-options input {
@@ -255,36 +263,31 @@ i[class^="icon-"].large:before {
     display: block;
     font-size: 13px;
     font-weight: bold;
-    margin-top: 7px;
-}
-
-.oae-large-options-container .oae-large-options.checked {
-    border: 8px solid;
-    padding-top: 6px;
+    margin-top: 15px;
 }
 
-.oae-large-options-container .oae-large-options + i {
+.oae-large-options-container i.icon-ok {
     display: none;
 }
 
-.oae-large-options-container .oae-large-options.checked + i {
+.oae-large-options-container label.checked i.icon-ok {
     -webkit-border-radius: 100px;
        -moz-border-radius: 100px;
             border-radius: 100px;
     display: block;
-    margin-left: 65px;
-    position: absolute;
-    top: 128px;
+    height: 35px;
+    margin: 0 auto;
+    position: relative;
+    top: 130px;
+    width: 35px;
+    z-index: 1000;
 }
 
-.oae-large-options-container .oae-large-options.checked + i:before {
+.oae-large-options-container label.checked i.icon-ok:before {
     font-size: 24px;
-    height: 30px;
     padding-top: 5px;
-    width: 35px;
 }
 
-
 /************************
  ** SUCCESS/FAIL ICONS **
  ************************/
@@ -403,7 +406,6 @@ div.oae-thumbnail a {
 }
 
 div.oae-thumbnail div {
-    background-position: center;
     background-repeat: no-repeat;
     background-size: cover;
 }
@@ -515,6 +517,7 @@ div.oae-thumbnail i[class^="icon-"] {
  * - The `small` tag is used to show some additional clip metadata and is optional.
  * - When a clip should not be clickable (e.g. in non-manager mode of a page), the `disabled` attribute
  *   should be added to the button. This will hide any caret icons and will make the clip unclickable.
+ * - If a clip should not be visible on smaller viewports the `hidden-xs hidden-sm` classes should be applied.
  */
 
 /* Clip container */
@@ -530,7 +533,7 @@ div.oae-thumbnail i[class^="icon-"] {
 }
 
 .oae-clip-container .oae-clip-container-right {
-    margin-right: 55px;
+    margin-right: 10px;
     right: 0;
 }
 
@@ -538,7 +541,7 @@ div.oae-thumbnail i[class^="icon-"] {
     float: left;
     margin: -16px 10px 10px;
     position: relative;
-    z-index: 100;
+    z-index: 101;
 }
 
 /* Clip fold */
@@ -667,19 +670,20 @@ div.oae-thumbnail i[class^="icon-"] {
 
 .oae-clip .oae-clip-content small {
     clear: both;
-    display: block;
     font-size: 12px;
     line-height: 1;
+    max-width: 300px;
     font-weight: normal;
-    white-space: nowrap;
 }
 
 /* Clip actions */
 
 .oae-clip .oae-clip-content > div > ul {
+    display: none;
     list-style: none;
     margin: 0 10px;
-    display: none;
+    padding-bottom: 10px;
+    padding-left: 0;
 }
 
 .oae-clip .oae-clip-content > div > ul li {
@@ -690,16 +694,283 @@ div.oae-thumbnail i[class^="icon-"] {
     -webkit-border-radius: 6px;
        -moz-border-radius: 6px;
             border-radius: 6px;
+    display: block;
     font-size: 11px;
+    line-height: 23px;
     min-width: 70px;
     padding: 10px;
-    margin-bottom: 10px;
-    text-align: center;
+    text-align: left;
+    width: 100%;
 }
 
 .oae-clip .oae-clip-content > div > ul li button i {
+    display: inline-block;
+    float: left;
+    margin: 0 0 3px;
+    padding-right: 7px;
+    width: 30px;
+}
+
+@media (max-width: 510px) {
+    .oae-clip .oae-clip-content h1,
+    .oae-clip .oae-clip-content small {
+        max-width: 140px;
+    }
+}
+
+@media (max-width: 350px) {
+    .oae-clip .oae-clip-content h1,
+    .oae-clip .oae-clip-content small {
+        max-width: 110px;
+    }
+}
+
+@media (min-width: 992px) {
+    .oae-clip .oae-clip-content > div > ul li button {
+        display: inline-block;
+        text-align: center;
+        width: auto;
+    }
+
+    .oae-clip .oae-clip-content > div > ul li button i {
+        display: block;
+        float: none;
+        margin: 0 auto 3px;
+    }
+}
+
+
+/*************************
+ * LEFT HAND NAVIGATION **
+ ************************/
+
+/**
+ * The left hand navigation component will take care of all left hand navigation and rendering the pages and widget sassociated to the items in it.
+ * On a mobile device the left hand navigation will be collapsed by default. If the left hand navigation opens and the page width exceeds the width
+ * of the device the content will be pushed off screen using `overflow: hidden` on the `.oae-page` container. When a list item is clicked that brings
+ * the user to a new page the left hand navigation is closed automatically. When an `action button` is clicked the left hand navigation doesn't close.
+ * When the page width is big enough to support content and left hand navigation to be shown the collapse icon is hidden and the navigation shown.
+ *
+ * The left hand navigation can consist of the following elements:
+ *     - `Action buttons` are list items with a button that trigger a widget (e.g. trigger upload widget)
+ *     - `Page links` are list items with a link to a page. When clicked the associated widgets are loaded into the .oae-page container and diplayed (e.g. show `My library`).
+ *     - `Parent -> child`. A list of children for a specific list item (e.g. `Create` has children `Create group`, `Create document`, `Create link`, ...).
+ *     - `Custom list items` when the left hand navigation needs to be customized (e.g. Search needs to be able to refine and requires a list of checkboxes for `people`, `groups`, `content` and `discussion`).
+ *
+ * Notes on the available elements:
+ *     - `Actions buttons` are only shown on small viewports (defined by Bootstrap *-xs and *-sm @see http://getbootstrap.com/css/#grid) as they are meant to replace clip actions. Clips are not shown on smaller viewports.
+ *     - When an `action button` is clicked a widget is lazyloaded and shown on the page. The widget will not be inserted into the `.oae-page` container. This implies that the triggered widget needs to be able to initialize itsself.
+ *     - When a `page link` is clicked the associated page content is then rendered into the `.oae-page` container and widgets are initialized. If the requested page has been loaded already it is served from cache and no additional rendering is done.
+ *     - When clicking the parent item, the list of children is toggled. When one of the children is clicked the appropriate action is taken (see `action button` or `page link`).
+ *     - When a custom list item is clicked, the behavior will depend on what is defined for it. Although custom components are supported no default behavior is defined for them.
+ *
+ * Notes on the `.oae-page` container:
+ *     - When a page link is clicked the `.oae-page` container will be filled with the associated page content for the clicked item.
+ *         - If the page was already rendered it is not rendered again but shown from cache to the user.
+ *         - `Action buttons` do not render widgets into `.oae-page` but instead append them to the body or otherwise specified location by the widgets and expect the widgets to initialize themselves.
+ *     - Every `row` in the `.oae-page` container needs the `.oae-lhnavigation-toggle` button to be able to toggle the left hand navigation.
+ *         - Having the `.oae-lhnavigation-toggle` button in each row ensures the user can toggle the left hand navigation on every page.
+ *         - The `.oae-lhnavigation-toggle` button is hidden by default for anonymous users. If the `.oae-anon-toggle` class is added to `.oae-page` the button will be shown for anonymous users.
+ *
+ * - Example: Basic left hand navigation with an `action button` and a page `link`
+ *     - The first item is an `action button` item that will trigger the `upload` widget.
+ *     - The second item is a `page link` item that will render the `dashboard` page and all of its widgets into `.oae-page`.
+ *         - Any subsequent clicks on other `page link` items will create a sibling element in the `.oae-page` container to easily keep track of the rendered pages.
+ *     - `.oae-lhnavigation-border` is applied to `action buttons` to give the button a border-bottom.
+ *     - `hidden-md hidden-lg` are applied to `action buttons` to ensure they are hidden on larger viewports.
+ *
+ * <div class="oae-lhnavigation">
+ *     <ul class="nav nav-list">
+ *        <li class="clearfix oae-trigger-upload oae-lhnavigation-border hidden-md hidden-lg">
+ *             <button type="button" class="btn btn-link" title="__MSG__UPLOAD__">
+ *                 <i class="icon-cloud-upload pull-left"></i>
+ *                 <div>__MSG__UPLOAD__</div>
+ *             </button>
+ *         </li>
+ *         <li class="clearfix active" data-id="dashboard">
+ *             <a href="/me/dashboard" title="__MSG__RECENT_ACTIVITY__">
+ *                 <i class="icon-dashboard pull-left"></i>
+ *                 <div>__MSG__RECENT_ACTIVITY__</div>
+ *             </a>
+ *         </li>
+ *     </ul>
+ * </div>
+ * <div class="oae-page col-xs-12 col-sm-12 col-md-12">
+ *     <div class="row" data-id="dashboard">
+ *         <button type="button" class="oae-lhnavigation-toggle btn btn-link hidden-md hidden-lg">
+ *             <i class="icon-align-justify"></i>
+ *             <span class="oae-aural-text">__MSG__TOGGLE_NAVIGATION__</span>
+ *         </button>
+ *     </div>
+ * </div>
+ *
+ * - Example: Basic left hand navigation with a list of `action button` children and a `page link`
+ *     - The first item in the list exposes the `action button` children when clicked. It's only shown on smaller viewports
+ *     - The children are all action buttons which trigger a widget.
+ *     - The second item in the top level list is a `page link` which behaves the same as the previous example
+ *
+ * <div class="oae-lhnavigation">
+ *     <ul class="nav nav-list">
+ *        <li class="clearfix collapse oae-lhnavigation-border hidden-md hidden-lg">
+ *            <button type="button" class="btn btn-link" title="Create">
+ *                <div class="lhnavigation-caret-container pull-right">
+ *                    <i class="icon-caret-left pull-right">
+ *                        <span class="oae-aural-text">Open navigation</span>
+ *                    </i>
+ *                    <i class="icon-caret-down pull-right hide">
+ *                        <span class="oae-aural-text">Close navigation</span>
+ *                    </i>
+ *                </div>
+ *                <i class="icon-plus-sign pull-left"></i>
+ *                <div>Create</div>
+ *            </button>
+ *            <ul class="nav nav-list lhnavigation-collapsed hide">
+ *                <li class="clearfix oae-trigger-creategroup hidden-md hidden-lg">
+ *                    <button type="button" class="btn btn-link" title="Group">
+ *                        <i class="icon-group pull-left"></i>
+ *                        <div>Group</div>
+ *                    </button>
+ *                </li>
+ *            </ul>
+ *        </li>
+ *         <li class="clearfix active" data-id="dashboard">
+ *             <a href="/me/dashboard" title="__MSG__RECENT_ACTIVITY__">
+ *                 <i class="icon-dashboard pull-left"></i>
+ *                 <div>__MSG__RECENT_ACTIVITY__</div>
+ *             </a>
+ *         </li>
+ *     </ul>
+ * </div>
+ * <div class="oae-page col-xs-12 col-sm-12 col-md-12">
+ *     <div class="row" data-id="dashboard">
+ *         <button type="button" class="oae-lhnavigation-toggle btn btn-link hidden-md hidden-lg">
+ *             <i class="icon-align-justify"></i>
+ *             <span class="oae-aural-text">__MSG__TOGGLE_NAVIGATION__</span>
+ *         </button>
+ *     </div>
+ * </div>
+ *
+ * - Example: Custom hand navigation with a list of checkboxes (e.g. to refine a search)
+ *     - The example shows a custom type of list items that lets users check boxes
+ *     - Changing the value of the checkbox needs to be handled separately as it is a custom component.
+ *     - The `.oae-page` container needs custom handling to show the appropriate content as the left hand navigation will not take care of it in this example.
+ *     - A navigation header is added in this example to provide extra detail on the navigation items.
+ *
+ * <div class="oae-lhnavigation">
+ *     <ul id="search-refine-type" class="nav nav-list hidden-xs hidden-sm">
+ *         <li class="nav-header">__MSG__REFINE_YOUR_SEARCH_BY_TYPE__</li>
+ *         <li><label class="checkbox"><input type="checkbox" data-type="user"><div>__MSG__PEOPLE__</div></label></li>
+ *         <li><label class="checkbox"><input type="checkbox" data-type="group"><div>__MSG__GROUPS__</div></label></li>
+ *         <li><label class="checkbox"><input type="checkbox" data-type="content"><div>__MSG__CONTENT__</div></label></li>
+ *         <li><label class="checkbox"><input type="checkbox" data-type="discussion"><div>__MSG__DISCUSSIONS__</div></label></li>
+ *     </ul>
+ * </div>
+ * <div class="oae-page col-xs-12 col-sm-12 col-md-12">
+ *     <div class="row">
+ *         <button type="button" class="oae-lhnavigation-toggle btn btn-link hidden-md hidden-lg">
+ *             <i class="icon-align-justify"></i>
+ *             <span class="oae-aural-text">__MSG__TOGGLE_NAVIGATION__</span>
+ *         </button>
+ *     </div>
+ * </div>
+ *
+ * @see lhnavigation widget for documentation on how to initialize the left hand navigation and page using JavaScript.
+ */
+
+/* Left hand navigation */
+
+.oae-lhnavigation {
+    margin-left: 10px;
+    margin-top: -5px;
+    position: absolute;
+    width: 210px;
+    z-index: 99;
+}
+
+.oae-lhnavigation > ul.nav {
+    margin-top: 12px;
+    width: 210px;
+}
+
+.oae-lhnavigation > ul.nav > li.hide {
+    display: none !important;
+}
+
+.oae-lhnavigation > ul.nav > li.nav-header {
+    margin-top: 10px;
+}
+
+.oae-lhnavigation > ul.nav > li button {
+    padding: 0 12px 5px;
+    text-align: left;
+    width: 100%;
+}
+
+.oae-lhnavigation > ul.nav > li a div,
+.oae-lhnavigation > ul.nav > li button div {
+    padding-top: 8px;
+}
+
+.oae-lhnavigation > ul.nav > li {
+    margin: 3px 12px 0 0;
+}
+
+.oae-lhnavigation > ul.nav > li.oae-lhnavigation-border {
+    border-bottom-style: solid;
+    border-bottom-width: 1px;
+}
+
+.oae-lhnavigation > ul.nav > li a {
+    padding: 0 12px 8px;
+}
+
+/* Left hand navigation toggle */
+
+.oae-lhnavigation > ul.nav > li button div.lhnavigation-caret-container {
+    padding-top: 0;
+    margin-right: -12px;
+}
+
+.oae-lhnavigation > ul.nav > li button div.lhnavigation-caret-container [class^="icon-"] {
+    margin-right: 0;
+}
+
+.oae-lhnavigation-toggle {
+    position: relative;
+    z-index: 100;
+}
+
+.oae-page.oae-anon-toggle .oae-lhnavigation-toggle.hide {
     display: block;
-    margin: 0 auto 3px;
+}
+
+/* Page content */
+
+.oae-page {
+    min-width: 280px;
+    padding: 5px 25px;
+}
+
+.oae-lhnavigation.oae-lhnav-expanded + .oae-page {
+    min-width: 480px;
+    padding: 5px 25px 5px 220px;
+}
+
+/* iPhone resolution */
+@media only screen and (min-device-width : 320px) and (max-device-width : 480px) {
+    .oae-page {
+        padding: 5px 10px 50px;
+    }
+}
+
+@media (min-width: 992px) {
+    .oae-page {
+        padding: 5px 25px 5px 220px !important;
+    }
+    .oae-lhnavigation {
+        opacity: 1 !important;
+        width: 210px !important;
+    }
 }
 
 
@@ -770,6 +1041,11 @@ div.oae-thumbnail i[class^="icon-"] {
 
 .oae-tile .oae-thumbnail.oae-thumbnail-large:before {
     margin-top: -50px;
+    padding-top: 80px;
+}
+
+.oae-tile .oae-thumbnail img {
+    height: auto;
 }
 
 /* Tile metadata */
@@ -883,22 +1159,50 @@ div.oae-thumbnail i[class^="icon-"] {
 /* List item metadata */
 
 .oae-listitem > div:not(.oae-thumbnail) {
-    display: table-cell;
+    display: -webkit-flex;
+    display: -moz-flex;
+    display: -ms-flexbox;
+    display: -ms-flex;
+    display: flex;
     vertical-align: middle;
     height: 50px;
 }
 
 .oae-listitem.oae-listitem-compact > div:not(.oae-thumbnail) {
     height: 25px;
+    -webkit-flex-direction: row;
+       -moz-flex-direction: row;
+        -ms-flex-direction: row;
+            flex-direction: row;
+}
+
+/* IE9 specific fallback for flexbox */
+.ie-lt10 .oae-listitem.oae-listitem-compact > div:not(.oae-thumbnail) {
     width: auto;
 }
 
+.oae-list-details-item .oae-listitem > div:not(.oae-thumbnail) {
+    -webkit-flex-direction: column;
+       -moz-flex-direction: column;
+        -ms-flex-direction: column;
+            flex-direction: column;
+}
+
 .oae-listitem h3 {
     display: inline-block;
+    -webkit-flex: 10;
+       -moz-flex: 10;
+        -ms-flex: 10;
+            flex: 10;
     font-size: 16px;
     font-weight: 500;
+    height: 25px;
     line-height: 25px;
     margin: 0;
+}
+
+/* IE9 specific fallback for flexbox */
+.ie-lt10 .oae-listitem h3 {
     max-width: 450px;
 }
 
@@ -911,8 +1215,13 @@ div.oae-thumbnail i[class^="icon-"] {
 
 .oae-listitem.oae-listitem-compact small {
     display: inline-block;
+    -webkit-flex: 2;
+       -moz-flex: 2;
+        -ms-flex: 2;
+            flex: 2;
     line-height: 25px;
     margin-left: 20px;
+    min-width: 100px;
 }
 
 /* List item actions */
@@ -984,6 +1293,11 @@ ul.oae-list.oae-list-grid > li {
     margin: 0 14px 24px 0;
 }
 
+ul.row.oae-list.oae-list-grid > li {
+    float: left;
+    margin: 0 14px 7px 0;
+}
+
 ul.oae-list.oae-list-grid > li .oae-thumbnail,
 ul.oae-list.oae-list-grid > li.oae-list-actions {
     height: 162px;
@@ -994,17 +1308,22 @@ ul.oae-list.oae-list-grid > li.oae-list-actions {
 
 ul.oae-list > li .oae-list-details-item,
 ul.oae-list > li .oae-list-compact-item  {
-    display: table;
     width: 100%;
 }
 
+/* IE9 specific fallback for flexbox */
+.ie-lt10 ul.oae-list.oae-list-details > li .oae-list-details-item,
+.ie-lt10 ul.oae-list.oae-list-compact > li .oae-list-compact-item  {
+    display: table;
+}
+
 ul.oae-list > li .oae-listitem {
-    margin-bottom: 0px;
+    margin-bottom: 0;
     margin-top: 10px;
 }
 
 ul.oae-list > li:first-child .oae-listitem {
-    margin-top: 0px;
+    margin-top: 0;
 }
 
 
@@ -1019,13 +1338,14 @@ ul.oae-list > li:first-child .oae-listitem {
  * Some example HTML for a list options view:
  *
  *  <div class="oae-list-options">
- *      <div>
- *          <button class="btn oae-list-options-toggle">
- *              <h2>__MSG__LIBRARY__ <i class="icon-caret-down"></i></h2>
+ *      <div class="row">
+ *          <button class="btn col-xs-12 col-sm-6 oae-list-options-toggle">
+ *              <h2 class="pull-left">__MSG__LIBRARY__ <i class="icon-caret-down"></i></h2>
  *          </button>
- *          <div class="pull-right">
- *              <form class="form-search" id="library_search_form">
- *                  <input type="text" class="search-query" placeholder="__MSG__NARROW_BY_KEYWORD__">
+ *          <div class="pull-right col-xs-12 col-sm-6">
+ *              <form id="library-search-form" class="form-search" role="search">
+ *                  <label class="control-label oae-aural-text" for="library-search-query">__MSG__NARROW_BY_KEYWORD__</label>
+ *                  <input type="text" id="library-search-query" class="form-control pull-right search-query" placeholder="__MSG__NARROW_BY_KEYWORD__"/>
  *              </form>
  *          </div>
  *      </div>
@@ -1074,10 +1394,15 @@ ul.oae-list > li:first-child .oae-listitem {
 
 .oae-list-options > div {
     line-height: 30px;
-    margin-bottom: 15px;
+    margin: 0;
     clear: both;
 }
 
+.oae-list-options > div:first-child > * {
+    margin-bottom: 15px;
+    padding: 0;
+}
+
 .oae-list-options .oae-list-options-toggle,
 .oae-list-options .btn.oae-list-options-toggle,
 .oae-list-options .btn.oae-list-options-toggle:disabled,
@@ -1094,7 +1419,7 @@ ul.oae-list > li:first-child .oae-listitem {
 }
 
 .oae-list-options .oae-list-options-toggle h2 {
-    margin: 0;
+    margin: 8px 0 0;
     font-size: 20px;
     line-height: 1.2;
 }
@@ -1117,8 +1442,19 @@ ul.oae-list > li:first-child .oae-listitem {
     margin-bottom: 0;
 }
 
+@media (min-width: 771px) {
+    .oae-list-options form input.search-query {
+        max-width: 400px;
+    }
+}
+
+
 /* Actions bar */
 
+.oae-list-options .oae-list-options-actions {
+    margin-bottom: 15px;
+}
+
 .oae-list-options .oae-list-options-actions > input,
 .oae-list-options .oae-list-options-actions > button {
     margin-right: 7px;
@@ -1126,6 +1462,7 @@ ul.oae-list > li:first-child .oae-listitem {
 
 .oae-list-options .oae-list-options-actions .btn i {
     font-size: 18px;
+    line-height: 1.2;
 }
 
 .oae-list-options .btn-group .btn i {
@@ -1172,7 +1509,7 @@ ul.oae-list > li:first-child .oae-listitem {
 /* Core list action styles */
 
 .oae-list-actions ul {
-    margin: 0px;
+    margin: 0;
 }
 
 .oae-list-actions ul > li {
@@ -1199,6 +1536,7 @@ ul.oae-list.oae-list-grid li.oae-list-actions div.oae-thumbnail {
             box-shadow: none;
     height: 150px;
     margin: 5px;
+    min-width: 150px;
     width: 150px;
 }
 
@@ -1210,6 +1548,10 @@ ul.oae-list.oae-list-grid .oae-list-actions.oae-list-actions-multiple div.oae-th
     margin-top: -60px;
 }
 
+ul.oae-list.oae-list-grid .oae-list-actions .btn {
+    white-space: normal;
+}
+
 ul.oae-list.oae-list-grid .oae-list-actions .btn i {
     display: none;
 }
@@ -1241,3 +1583,31 @@ ul.oae-list:not(.oae-list-grid) .oae-list-actions ul > li {
     display: inline;
     margin-right: 10px;
 }
+
+/* Responsive list overrides */
+
+@media (max-width: 480px) {
+    .oae-list-options-actions {
+        display: none !important;
+    }
+    .oae-list-options .oae-list-options-toggle i {
+        display: none !important;
+    }
+    .oae-listitem input[type="checkbox"],
+    .oae-list-grid-item input[type="checkbox"] {
+        display: none;
+    }
+}
+
+@media (max-width: 680px) {
+    .oae-lhnavigation.oae-lhnav-expanded + .oae-page .oae-list-options-actions {
+        display: none !important;
+    }
+    .oae-lhnavigation.oae-lhnav-expanded + .oae-page .oae-list-options .oae-list-options-toggle i {
+        display: none !important;
+    }
+    .oae-lhnavigation.oae-lhnav-expanded + .oae-page .oae-listitem input[type="checkbox"],
+    .oae-lhnavigation.oae-lhnav-expanded + .oae-page .oae-list-grid-item input[type="checkbox"] {
+        display: none;
+    }
+}
diff --git a/shared/oae/css/oae.skin.less b/shared/oae/css/oae.skin.less
index 388682119c2..a9260e36f0e 100644
--- a/shared/oae/css/oae.skin.less
+++ b/shared/oae/css/oae.skin.less
@@ -365,7 +365,8 @@ input[type="search"],
 input[type="tel"],
 input[type="color"],
 .uneditable-input,
-ul.as-selections {
+ul.as-selections,
+#recaptcha_image img {
     border-color: @form-border-color;
     -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
        -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
@@ -426,7 +427,7 @@ ul.as-selections.as-selections-focus {
 /* Modal dialog title color */
 @modal-title-color: #777;
 
-.modal, .dropdown-menu, .popover {
+.modal .modal-dialog .modal-content, .dropdown-menu, .popover {
     /* Don't render the background gradient in IE, as the overflow hidden caused by it will
        result in autosuggest results being cut off. https://github.com/oaeproject/3akai-ux/pull/2909 */
     .background-gradient-two(@modal-gradient1-color, @modal-gradient2-color, @skipIE:true);
@@ -523,18 +524,26 @@ ul.as-selections.as-selections-focus {
 @lhnav-item-background-hover-color: transparent;
 /* Left hand navigation item selected background color */
 @lhnav-item-background-selected-color: transparent;
+/* Left hand navigation actions border color */
+@lhnav-item-border-color: #EEE;
 
 .nav > li > a,
+.nav > li > button,
 .nav > li i,
 .nav > li.nav-header {
     color: @lhnav-item-text-color;
     background-color: @lhnav-item-background-color;
 }
 
+.nav > li:hover,
 .nav > li > a:hover,
 .nav > li > a:focus,
 .nav > li > a:hover i,
-.nav > li > a:focus i {
+.nav > li > a:focus i,
+.nav > li > button:hover,
+.nav > li > button:focus,
+.nav > li > button:hover i,
+.nav > li > button:focus i {
     color: @lhnav-item-text-hover-color;
     background-color: @lhnav-item-background-hover-color;
 }
@@ -542,6 +551,9 @@ ul.as-selections.as-selections-focus {
 .nav > li.active > a,
 .nav > li.active > a:hover,
 .nav > li.active > a:focus,
+.nav > li.active > button,
+.nav > li.active > button:hover,
+.nav > li.active > button:focus,
 .nav > li.active > a i,
 .nav > li.active > a:hover i,
 .nav > li.active > a:focus i {
@@ -549,6 +561,9 @@ ul.as-selections.as-selections-focus {
     background-color: @lhnav-item-background-selected-color;
 }
 
+.nav > li.oae-lhnavigation-border {
+    border-bottom: @lhnav-item-border-color;
+}
 
 /*********************************
  ** @section  Tabs **
@@ -743,16 +758,16 @@ div.oae-thumbnail {
     background-color: @visibility-toggle-background-color;
 }
 
-.oae-large-options-container label .oae-large-options.checked {
+.oae-large-options-container label.checked .oae-large-options {
     border-color: @visibility-toggle-selected1-color;
     background-color: @visibility-toggle-selected2-color;
 }
 
-.oae-large-options-container .oae-large-options.checked + i {
+.oae-large-options-container label.checked i.icon-ok {
     background-color: @visibility-toggle-selected1-color;
 }
 
-.oae-large-options-container .oae-large-options.checked + i:before {
+.oae-large-options-container label.checked i.icon-ok:before {
     color: @visibility-toggle-background-color;
 }
 
diff --git a/shared/oae/errors/accessdenied.html b/shared/oae/errors/accessdenied.html
index 5faa27f3617..4e6adae0ae6 100644
--- a/shared/oae/errors/accessdenied.html
+++ b/shared/oae/errors/accessdenied.html
@@ -1,6 +1,7 @@
 <!DOCTYPE HTML>
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
+        <meta name="viewport" content="width=device-width, user-scalable=no">
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
         <noscript>
@@ -19,13 +20,13 @@
         <div data-widget="topnavigation"><!-- --></div>
 
         <!-- BODY -->
-        <div class="oae-branding-container oae-main-content">
+        <main class="oae-branding-container oae-main-content">
             <div id="error-content">
-                <div class="row-fluid oae-panel-primary">
-                    <div class="span4 text-right">
-                        <h1>__MSG__401__ <br/> <span>__MSG__ACCESS_DENIED__</span></h1>
+                <div class="row oae-panel-primary">
+                    <div class="col-md-offset-1 col-md-3">
+                        <h1>__MSG__401__<br/> <span>__MSG__ACCESS_DENIED__</span></h1>
                     </div>
-                    <div class="span8">
+                    <div class="col-md-8">
                         <div id="error-quote-container" class="oae-panel-tertiary">
                             <p id="error-quote">"__MSG__QUOTE_ACCESS_DENIED__"</p>
                             <p id="error-signin" class="hide">
@@ -39,7 +40,7 @@ <h1>__MSG__401__ <br/> <span>__MSG__ACCESS_DENIED__</span></h1>
                     </div>
                 </div>
             </div>
-        </div>
+        </main>
 
         <!-- FOOTER -->
         <div data-widget="footer"><!-- --></div>
diff --git a/shared/oae/errors/css/oae.error.css b/shared/oae/errors/css/oae.error.css
index 9da627b1b4e..cf8bc37ba3f 100644
--- a/shared/oae/errors/css/oae.error.css
+++ b/shared/oae/errors/css/oae.error.css
@@ -17,15 +17,20 @@
     margin-top: 2%;
 }
 
-#error-content .row-fluid {
+#error-content .row {
     margin: 100px auto;
     max-width: 900px;
     padding: 50px 0;
 }
 
+#error-content .row div:first-child {
+    margin-bottom: 50px;
+}
+
 #error-content h1 {
     font-size: 100px;
     font-weight: 200;
+    line-height: .4;
     margin-top: 15px;
 }
 
@@ -35,9 +40,9 @@
 }
 
 #error-content #error-quote-container {
+    max-width: 500px;
     padding: 20px;
     position: relative;
-    width: 460px;
 }
 
 #error-content #error-quote-container #error-quote {
@@ -53,7 +58,7 @@
 }
 
 #error-content #error-quote-container + div {
-    margin: 10px 0 0 80px;
+    margin: -30px 0 0 80px;
 }
 
 #error-content #error-quote-container:after {
@@ -66,3 +71,11 @@
     left: 40px;
     position: absolute;
 }
+
+/* iPhone resolution */
+@media only screen and (min-device-width : 320px) and (max-device-width : 480px) {
+    #error-content .row {
+        margin: 10px auto;
+        padding: 10px 0;
+    }
+}
diff --git a/shared/oae/errors/maintenance.html b/shared/oae/errors/maintenance.html
index f58247e4366..ff35d6dcd7c 100644
--- a/shared/oae/errors/maintenance.html
+++ b/shared/oae/errors/maintenance.html
@@ -1,6 +1,7 @@
 <!DOCTYPE HTML>
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
+        <meta name="viewport" content="width=device-width, user-scalable=no">
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
         <noscript>
@@ -19,13 +20,13 @@
     </head>
     <body style="display: block;">
         <!-- BODY -->
-        <div class="oae-branding-container error-static oae-main-content">
+        <main class="oae-branding-container error-static oae-main-content">
             <div id="error-content">
-                <div class="row-fluid oae-panel-primary">
-                    <div class="span4 text-right">
-                        <h1>503 <br/> <span>Down for maintenance</span></h1>
+                <div class="row oae-panel-primary">
+                    <div class="col-md-offset-1 col-md-3">
+                        <h1>503<br/> <span>Down for maintenance</span></h1>
                     </div>
-                    <div class="span8">
+                    <div class="col-md-8">
                         <div id="error-quote-container" class="oae-panel-tertiary">
                             <p id="error-quote">"I like to be stylish and edgy, but also low maintenance."</p>
                         </div>
@@ -33,6 +34,6 @@ <h1>503 <br/> <span>Down for maintenance</span></h1>
                     </div>
                 </div>
             </div>
-        </div>
+        </main>
     </body>
 </html>
diff --git a/shared/oae/errors/noscript.html b/shared/oae/errors/noscript.html
index 08e225f251f..1350cdd15c7 100644
--- a/shared/oae/errors/noscript.html
+++ b/shared/oae/errors/noscript.html
@@ -1,6 +1,7 @@
 <!DOCTYPE HTML>
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
+        <meta name="viewport" content="width=device-width, user-scalable=no">
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
 
@@ -16,19 +17,19 @@
     </head>
     <body style="display: block;">
         <!-- BODY -->
-        <div class="oae-branding-container error-static oae-main-content">
+        <main class="oae-branding-container error-static oae-main-content">
             <div id="error-content">
-                <div class="row-fluid oae-panel-primary">
-                    <div class="span5 text-right">
+                <div class="row oae-panel-primary">
+                    <div class="col-md-offset-1 col-md-4">
                         <h1>Sorry!</h1>
                     </div>
-                    <div class="span7">
+                    <div class="col-md-7">
                         <div id="error-quote-container" class="oae-panel-tertiary">
                             <span>Javascript must be enabled to use the Open Academic Environment. Please turn on JavaScript in your browser and refresh the page. If you need assistance, please visit <a href="http://activatejavascript.org/" target="_blank" title="Enable JavaScript in the most popular browsers">http://activatejavascript.org</a>.</span>
                         </div>
                     </div>
                 </div>
             </div>
-        </div>
+        </main>
     </body>
 </html>
diff --git a/shared/oae/errors/notfound.html b/shared/oae/errors/notfound.html
index 6bd469958c5..4054658ef62 100644
--- a/shared/oae/errors/notfound.html
+++ b/shared/oae/errors/notfound.html
@@ -1,6 +1,7 @@
 <!DOCTYPE HTML>
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
+        <meta name="viewport" content="width=device-width, user-scalable=no">
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
         <noscript>
@@ -19,13 +20,13 @@
         <div data-widget="topnavigation"><!-- --></div>
 
         <!-- BODY -->
-        <div class="oae-branding-container oae-main-content">
+        <main class="oae-branding-container oae-main-content">
             <div id="error-content">
-                <div class="row-fluid oae-panel-primary">
-                    <div class="span4 text-right">
-                        <h1>__MSG__404__ <br/> <span>__MSG__PAGE_NOT_FOUND__</span></h1>
+                <div class="row oae-panel-primary">
+                    <div class="col-md-offset-1 col-md-3">
+                        <h1>__MSG__404__<br/> <span>__MSG__PAGE_NOT_FOUND__</span></h1>
                     </div>
-                    <div class="span8">
+                    <div class="col-md-8">
                         <div id="error-quote-container" class="oae-panel-tertiary">
                             <p id="error-quote">"__MSG__QUOTE_NOT_FOUND__"</p>
                             <a href="/search" class="btn btn-primary">__MSG__SEARCH__</a> <span>__MSG__SEARCH_FOR_CONTENT_PEOPLE_GROUPS__</span>
@@ -34,7 +35,7 @@ <h1>__MSG__404__ <br/> <span>__MSG__PAGE_NOT_FOUND__</span></h1>
                     </div>
                 </div>
             </div>
-        </div>
+        </main>
 
         <!-- FOOTER -->
         <div data-widget="footer"><!-- --></div>
diff --git a/shared/oae/errors/unavailable.html b/shared/oae/errors/unavailable.html
index 0d9c99db919..43904bbcddd 100644
--- a/shared/oae/errors/unavailable.html
+++ b/shared/oae/errors/unavailable.html
@@ -1,6 +1,7 @@
 <!DOCTYPE HTML>
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
+        <meta name="viewport" content="width=device-width, user-scalable=no">
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
         <noscript>
@@ -19,13 +20,13 @@
     </head>
     <body style="display: block;">
         <!-- BODY -->
-        <div class="error-static oae-branding-container oae-main-content">
+        <main class="error-static oae-branding-container oae-main-content">
             <div id="error-content">
-                <div class="row-fluid oae-panel-primary">
-                    <div class="span4 text-right">
-                        <h1>502 <br/> <span>Service unavailable</span></h1>
+                <div class="row oae-panel-primary">
+                    <div class="col-md-offset-1 col-md-3">
+                        <h1>502<br/> <span>Service unavailable</span></h1>
                     </div>
-                    <div class="span8">
+                    <div class="col-md-8">
                         <div id="error-quote-container" class="oae-panel-tertiary">
                             <p id="error-quote">"Challenges are meant to be met and overcome."</p>
                         </div>
@@ -33,7 +34,7 @@ <h1>502 <br/> <span>Service unavailable</span></h1>
                     </div>
                 </div>
             </div>
-        </div>
+        </main>
 
         <!-- JAVASCRIPT -->
         <script data-main="/shared/oae/errors/js/unavailable.js" src="/shared/vendor/js/requirejs/require-jquery.js"></script>
diff --git a/shared/oae/js/bootstrap-plugins/bootstrap.modal.js b/shared/oae/js/bootstrap-plugins/bootstrap.modal.js
index b9409ca261a..dac4ed1a444 100644
--- a/shared/oae/js/bootstrap-plugins/bootstrap.modal.js
+++ b/shared/oae/js/bootstrap-plugins/bootstrap.modal.js
@@ -26,13 +26,13 @@ define(['jquery', 'bootstrap'], function($) {
     $.extend($.fn.modal.Constructor.prototype, {
         'lock': function() {
             // Set isShown to false. https://github.com/twitter/bootstrap/issues/1202#issuecomment-3698674
-            this.$element.data('modal').isShown = false;
+            this.$element.data('bs.modal').isShown = false;
             // Disable buttons that dismiss the modal
             $('#' + this.$element.attr('id') + ' [data-dismiss="modal"]').attr('disabled', 'disabled');
         },
         'unlock': function() {
             // Set isShown to true. https://github.com/twitter/bootstrap/issues/1202#issuecomment-3698674
-            this.$element.data('modal').isShown = true;
+            this.$element.data('bs.modal').isShown = true;
             // Enable buttons that dismiss the modal
             $('#' + this.$element.attr('id') + ' [data-dismiss="modal"]').removeAttr('disabled', 'disabled');
         }
diff --git a/shared/oae/js/jquery-plugins/jquery.responsive.js b/shared/oae/js/jquery-plugins/jquery.responsive.js
new file mode 100644
index 00000000000..651d983e8be
--- /dev/null
+++ b/shared/oae/js/jquery-plugins/jquery.responsive.js
@@ -0,0 +1,99 @@
+/*!
+ * Copyright 2013 Apereo Foundation (AF) Licensed under the
+ * Educational Community License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may
+ * obtain a copy of the License at
+ *
+ *     http://opensource.org/licenses/ECL-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS"
+ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * Utility plugin that handles the responsive left hand navigation interactions.
+ *     - Ability to open and close the navigation using the `.oae-lhnavigation-toggle` class on desktop and mobile.
+ *     - Toggling the visiblity of the navigation uses animation to fade-in/fade-out on desktop and mobile.
+ *     - When a `page link` is clicked on a mobile device the navigation will close (does not apply on desktop). The navigation stays visible when an `action button` is clicked as this doesn't show a new page.
+ */
+
+define(['jquery', 'oae.api.util'], function (jQuery, oaeUtil) {
+    (function($) {
+
+        var LHNAVIGATION_WIDTH = 210;
+        var LHNAVIGATION_PADDING = 25;
+
+        /**
+         * Open the left hand navigation
+         */
+        var openLhNav = function() {
+            // First set the opacity and width to 0 before animating it
+            $('.oae-lhnavigation').css({
+                'opacity': 0,
+                'width': 0
+            });
+            // Remove the bootstrap responsive hidden classes to show the left hand
+            // navigation when animating on smaller screens
+            $('.oae-lhnavigation > ul').removeClass('hidden-xs hidden-sm');
+            // Animate the opacity and width
+            $('.oae-lhnavigation').animate({
+                'opacity': 1,
+                'width': LHNAVIGATION_WIDTH  + 'px'
+            }, 250);
+            // Animate the padding of the page to 200px (width of the left hand nav) + 20 pixels (margin)
+            $('.oae-page').animate({
+                'padding-left': (LHNAVIGATION_WIDTH + 10) + 'px'
+            }, 250, function() {
+                $('.oae-lhnavigation').addClass('oae-lhnav-expanded');
+            });
+        };
+
+        /**
+         * Close the left hand navigation
+         */
+        var closeLhNav = function() {
+            // Animate the width and opacity to 0
+            $('.oae-lhnavigation').animate({
+                'opacity': 0,
+                'width': 0
+            }, 250);
+            // Animate the padding of the page to 25 pixels
+            $('.oae-page').animate({
+                'padding-left': LHNAVIGATION_PADDING + 'px'
+            }, 250, function() {
+                // Add the bootstrap and OAE helper classes
+                $('.oae-lhnavigation > ul').addClass('hidden-xs hidden-sm');
+                $('.oae-lhnavigation').removeClass('oae-lhnav-expanded');
+            });
+        };
+
+        /**
+         * Close the left hand navigation using animation when clicking a navigation link on a handheld device.
+         * Actions in the left hand navigation trigger a widget and shouldn't close the left hand navigation.
+         * If the user is on a desktop browser the left hand navigation should never close.
+         */
+        $(document).on('click', '.oae-lhnavigation > ul > li:not(.oae-lhnavigation-action)', function() {
+            if (oaeUtil.isHandheldDevice()) {
+                closeLhNav();
+            }
+        });
+
+        /**
+         * Toggle the left hand navigation with animation. The left hand navigation can only
+         * be toggled in small and extra small viewports.
+         */
+        $(document).on('click', '.oae-lhnavigation-toggle', function(ev) {
+            // If the left hand navigation is open, close it
+            if ($('.oae-lhnavigation').hasClass('oae-lhnav-expanded')) {
+                closeLhNav();
+            // If the left hand navigation is closed, open it
+            } else {
+                openLhNav();
+            }
+        });
+
+    })(jQuery);
+});
diff --git a/shared/oae/macros/autosuggest.html b/shared/oae/macros/autosuggest.html
index d79d87b33d9..346a2b16627 100644
--- a/shared/oae/macros/autosuggest.html
+++ b/shared/oae/macros/autosuggest.html
@@ -9,7 +9,7 @@
 
 <!-- SUGGESTED ITEMS -->
 <div id="autosuggest-suggested-template"><!--
-    <div class="oae-listitem oae-listitem-compact">
+    <div class="clearfix oae-listitem oae-listitem-compact">
         ${renderThumbnail(data, false, false, false)}
         <div>
             <h3 class="oae-threedots">${data.displayName}</h3>
diff --git a/shared/vendor/css/bootstrap.css b/shared/vendor/css/bootstrap.css
index 2f56af33f3b..c3db100a730 100644
--- a/shared/vendor/css/bootstrap.css
+++ b/shared/vendor/css/bootstrap.css
@@ -1,44 +1,10 @@
 /*!
- * Bootstrap v2.3.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ * Bootstrap v3.0.3 (http://getbootstrap.com)
+ * Copyright 2013 Twitter, Inc.
+ * Licensed under http://www.apache.org/licenses/LICENSE-2.0
  */
 
-.clearfix {
-  *zoom: 1;
-}
-
-.clearfix:before,
-.clearfix:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.clearfix:after {
-  clear: both;
-}
-
-.hide-text {
-  font: 0/0 a;
-  color: transparent;
-  text-shadow: none;
-  background-color: transparent;
-  border: 0;
-}
-
-.input-block-level {
-  display: block;
-  width: 100%;
-  min-height: 30px;
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-}
+/*! normalize.css v2.1.3 | MIT License | git.io/normalize */
 
 article,
 aside,
@@ -48,8 +14,10 @@ figure,
 footer,
 header,
 hgroup,
+main,
 nav,
-section {
+section,
+summary {
   display: block;
 }
 
@@ -57,31 +25,90 @@ audio,
 canvas,
 video {
   display: inline-block;
-  *display: inline;
-  *zoom: 1;
 }
 
 audio:not([controls]) {
   display: none;
+  height: 0;
+}
+
+[hidden],
+template {
+  display: none;
 }
 
 html {
-  font-size: 100%;
+  font-family: sans-serif;
   -webkit-text-size-adjust: 100%;
       -ms-text-size-adjust: 100%;
 }
 
+body {
+  margin: 0;
+}
+
+a {
+  background: transparent;
+}
+
 a:focus {
-  outline: thin dotted #333;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
+  outline: thin dotted;
 }
 
-a:hover,
-a:active {
+a:active,
+a:hover {
   outline: 0;
 }
 
+h1 {
+  margin: 0.67em 0;
+  font-size: 2em;
+}
+
+abbr[title] {
+  border-bottom: 1px dotted;
+}
+
+b,
+strong {
+  font-weight: bold;
+}
+
+dfn {
+  font-style: italic;
+}
+
+hr {
+  height: 0;
+  -moz-box-sizing: content-box;
+       box-sizing: content-box;
+}
+
+mark {
+  color: #000;
+  background: #ff0;
+}
+
+code,
+kbd,
+pre,
+samp {
+  font-family: monospace, serif;
+  font-size: 1em;
+}
+
+pre {
+  white-space: pre-wrap;
+}
+
+q {
+  quotes: "\201C" "\201D" "\2018" "\2019";
+}
+
+small {
+  font-size: 80%;
+}
+
 sub,
 sup {
   position: relative;
@@ -99,17 +126,26 @@ sub {
 }
 
 img {
-  width: auto\9;
-  height: auto;
-  max-width: 100%;
-  vertical-align: middle;
   border: 0;
-  -ms-interpolation-mode: bicubic;
 }
 
-#map_canvas img,
-.google-maps img {
-  max-width: none;
+svg:not(:root) {
+  overflow: hidden;
+}
+
+figure {
+  margin: 0;
+}
+
+fieldset {
+  padding: 0.35em 0.625em 0.75em;
+  margin: 0 2px;
+  border: 1px solid #c0c0c0;
+}
+
+legend {
+  padding: 0;
+  border: 0;
 }
 
 button,
@@ -117,20 +153,18 @@ input,
 select,
 textarea {
   margin: 0;
+  font-family: inherit;
   font-size: 100%;
-  vertical-align: middle;
 }
 
 button,
 input {
-  *overflow: visible;
   line-height: normal;
 }
 
-button::-moz-focus-inner,
-input::-moz-focus-inner {
-  padding: 0;
-  border: 0;
+button,
+select {
+  text-transform: none;
 }
 
 button,
@@ -141,15 +175,15 @@ input[type="submit"] {
   -webkit-appearance: button;
 }
 
-label,
-select,
-button,
-input[type="button"],
-input[type="reset"],
-input[type="submit"],
-input[type="radio"],
-input[type="checkbox"] {
-  cursor: pointer;
+button[disabled],
+html input[disabled] {
+  cursor: default;
+}
+
+input[type="checkbox"],
+input[type="radio"] {
+  padding: 0;
+  box-sizing: border-box;
 }
 
 input[type="search"] {
@@ -159,16 +193,27 @@ input[type="search"] {
   -webkit-appearance: textfield;
 }
 
-input[type="search"]::-webkit-search-decoration,
-input[type="search"]::-webkit-search-cancel-button {
+input[type="search"]::-webkit-search-cancel-button,
+input[type="search"]::-webkit-search-decoration {
   -webkit-appearance: none;
 }
 
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+
 textarea {
   overflow: auto;
   vertical-align: top;
 }
 
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
 @media print {
   * {
     color: #000 !important;
@@ -186,7 +231,6 @@ textarea {
   abbr[title]:after {
     content: " (" attr(title) ")";
   }
-  .ir a:after,
   a[href^="javascript:"]:after,
   a[href^="#"]:after {
     content: "";
@@ -207,7 +251,7 @@ textarea {
     max-width: 100% !important;
   }
   @page  {
-    margin: 0.5cm;
+    margin: 2cm .5cm;
   }
   p,
   h2,
@@ -219,5054 +263,5788 @@ textarea {
   h3 {
     page-break-after: avoid;
   }
+  select {
+    background: #fff !important;
+  }
+  .navbar {
+    display: none;
+  }
+  .table td,
+  .table th {
+    background-color: #fff !important;
+  }
+  .btn > .caret,
+  .dropup > .btn > .caret {
+    border-top-color: #000 !important;
+  }
+  .label {
+    border: 1px solid #000;
+  }
+  .table {
+    border-collapse: collapse !important;
+  }
+  .table-bordered th,
+  .table-bordered td {
+    border: 1px solid #ddd !important;
+  }
+}
+
+*,
+*:before,
+*:after {
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+html {
+  font-size: 62.5%;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
 }
 
 body {
-  margin: 0;
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 14px;
-  line-height: 20px;
+  line-height: 1.428571429;
   color: #333333;
   background-color: #ffffff;
 }
 
+input,
+button,
+select,
+textarea {
+  font-family: inherit;
+  font-size: inherit;
+  line-height: inherit;
+}
+
 a {
-  color: #0088cc;
+  color: #428bca;
   text-decoration: none;
 }
 
 a:hover,
 a:focus {
-  color: #005580;
+  color: #2a6496;
   text-decoration: underline;
 }
 
-.img-rounded {
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
+a:focus {
+  outline: thin dotted;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
 }
 
-.img-polaroid {
-  padding: 4px;
-  background-color: #fff;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-     -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-          box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+img {
+  vertical-align: middle;
 }
 
-.img-circle {
-  -webkit-border-radius: 500px;
-     -moz-border-radius: 500px;
-          border-radius: 500px;
+.img-responsive {
+  display: block;
+  height: auto;
+  max-width: 100%;
 }
 
-.row {
-  margin-left: -20px;
-  *zoom: 1;
+.img-rounded {
+  border-radius: 6px;
 }
 
-.row:before,
-.row:after {
-  display: table;
-  line-height: 0;
-  content: "";
+.img-thumbnail {
+  display: inline-block;
+  height: auto;
+  max-width: 100%;
+  padding: 4px;
+  line-height: 1.428571429;
+  background-color: #ffffff;
+  border: 1px solid #dddddd;
+  border-radius: 4px;
+  -webkit-transition: all 0.2s ease-in-out;
+          transition: all 0.2s ease-in-out;
 }
 
-.row:after {
-  clear: both;
+.img-circle {
+  border-radius: 50%;
 }
 
-[class*="span"] {
-  float: left;
-  min-height: 1px;
-  margin-left: 20px;
+hr {
+  margin-top: 20px;
+  margin-bottom: 20px;
+  border: 0;
+  border-top: 1px solid #eeeeee;
 }
 
-.container,
-.navbar-static-top .container,
-.navbar-fixed-top .container,
-.navbar-fixed-bottom .container {
-  width: 940px;
+.sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  border: 0;
 }
 
-.span12 {
-  width: 940px;
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+.h1,
+.h2,
+.h3,
+.h4,
+.h5,
+.h6 {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-weight: 500;
+  line-height: 1.1;
+  color: inherit;
 }
 
-.span11 {
-  width: 860px;
+h1 small,
+h2 small,
+h3 small,
+h4 small,
+h5 small,
+h6 small,
+.h1 small,
+.h2 small,
+.h3 small,
+.h4 small,
+.h5 small,
+.h6 small,
+h1 .small,
+h2 .small,
+h3 .small,
+h4 .small,
+h5 .small,
+h6 .small,
+.h1 .small,
+.h2 .small,
+.h3 .small,
+.h4 .small,
+.h5 .small,
+.h6 .small {
+  font-weight: normal;
+  line-height: 1;
+  color: #999999;
 }
 
-.span10 {
-  width: 780px;
+h1,
+h2,
+h3 {
+  margin-top: 20px;
+  margin-bottom: 10px;
 }
 
-.span9 {
-  width: 700px;
+h1 small,
+h2 small,
+h3 small,
+h1 .small,
+h2 .small,
+h3 .small {
+  font-size: 65%;
 }
 
-.span8 {
-  width: 620px;
+h4,
+h5,
+h6 {
+  margin-top: 10px;
+  margin-bottom: 10px;
 }
 
-.span7 {
-  width: 540px;
+h4 small,
+h5 small,
+h6 small,
+h4 .small,
+h5 .small,
+h6 .small {
+  font-size: 75%;
 }
 
-.span6 {
-  width: 460px;
+h1,
+.h1 {
+  font-size: 36px;
 }
 
-.span5 {
-  width: 380px;
+h2,
+.h2 {
+  font-size: 30px;
 }
 
-.span4 {
-  width: 300px;
+h3,
+.h3 {
+  font-size: 24px;
 }
 
-.span3 {
-  width: 220px;
+h4,
+.h4 {
+  font-size: 18px;
 }
 
-.span2 {
-  width: 140px;
+h5,
+.h5 {
+  font-size: 14px;
 }
 
-.span1 {
-  width: 60px;
+h6,
+.h6 {
+  font-size: 12px;
 }
 
-.offset12 {
-  margin-left: 980px;
+p {
+  margin: 0 0 10px;
 }
 
-.offset11 {
-  margin-left: 900px;
+.lead {
+  margin-bottom: 20px;
+  font-size: 16px;
+  font-weight: 200;
+  line-height: 1.4;
 }
 
-.offset10 {
-  margin-left: 820px;
+@media (min-width: 768px) {
+  .lead {
+    font-size: 21px;
+  }
 }
 
-.offset9 {
-  margin-left: 740px;
+small,
+.small {
+  font-size: 85%;
 }
 
-.offset8 {
-  margin-left: 660px;
+cite {
+  font-style: normal;
 }
 
-.offset7 {
-  margin-left: 580px;
+.text-muted {
+  color: #999999;
 }
 
-.offset6 {
-  margin-left: 500px;
+.text-primary {
+  color: #428bca;
 }
 
-.offset5 {
-  margin-left: 420px;
+.text-primary:hover {
+  color: #3071a9;
 }
 
-.offset4 {
-  margin-left: 340px;
+.text-warning {
+  color: #8a6d3b;
 }
 
-.offset3 {
-  margin-left: 260px;
+.text-warning:hover {
+  color: #66512c;
 }
 
-.offset2 {
-  margin-left: 180px;
+.text-danger {
+  color: #a94442;
 }
 
-.offset1 {
-  margin-left: 100px;
+.text-danger:hover {
+  color: #843534;
 }
 
-.row-fluid {
-  width: 100%;
-  *zoom: 1;
+.text-success {
+  color: #3c763d;
 }
 
-.row-fluid:before,
-.row-fluid:after {
-  display: table;
-  line-height: 0;
-  content: "";
+.text-success:hover {
+  color: #2b542c;
 }
 
-.row-fluid:after {
-  clear: both;
+.text-info {
+  color: #31708f;
 }
 
-.row-fluid [class*="span"] {
-  display: block;
-  float: left;
-  width: 100%;
-  min-height: 30px;
-  margin-left: 2.127659574468085%;
-  *margin-left: 2.074468085106383%;
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
+.text-info:hover {
+  color: #245269;
 }
 
-.row-fluid [class*="span"]:first-child {
-  margin-left: 0;
+.text-left {
+  text-align: left;
 }
 
-.row-fluid .controls-row [class*="span"] + [class*="span"] {
-  margin-left: 2.127659574468085%;
+.text-right {
+  text-align: right;
 }
 
-.row-fluid .span12 {
-  width: 100%;
-  *width: 99.94680851063829%;
-}
+.text-center {
+  text-align: center;
+}
 
-.row-fluid .span11 {
-  width: 91.48936170212765%;
-  *width: 91.43617021276594%;
+.page-header {
+  padding-bottom: 9px;
+  margin: 40px 0 20px;
+  border-bottom: 1px solid #eeeeee;
 }
 
-.row-fluid .span10 {
-  width: 82.97872340425532%;
-  *width: 82.92553191489361%;
+ul,
+ol {
+  margin-top: 0;
+  margin-bottom: 10px;
 }
 
-.row-fluid .span9 {
-  width: 74.46808510638297%;
-  *width: 74.41489361702126%;
+ul ul,
+ol ul,
+ul ol,
+ol ol {
+  margin-bottom: 0;
 }
 
-.row-fluid .span8 {
-  width: 65.95744680851064%;
-  *width: 65.90425531914893%;
+.list-unstyled {
+  padding-left: 0;
+  list-style: none;
 }
 
-.row-fluid .span7 {
-  width: 57.44680851063829%;
-  *width: 57.39361702127659%;
+.list-inline {
+  padding-left: 0;
+  list-style: none;
 }
 
-.row-fluid .span6 {
-  width: 48.93617021276595%;
-  *width: 48.88297872340425%;
+.list-inline > li {
+  display: inline-block;
+  padding-right: 5px;
+  padding-left: 5px;
 }
 
-.row-fluid .span5 {
-  width: 40.42553191489362%;
-  *width: 40.37234042553192%;
+.list-inline > li:first-child {
+  padding-left: 0;
 }
 
-.row-fluid .span4 {
-  width: 31.914893617021278%;
-  *width: 31.861702127659576%;
+dl {
+  margin-top: 0;
+  margin-bottom: 20px;
 }
 
-.row-fluid .span3 {
-  width: 23.404255319148934%;
-  *width: 23.351063829787233%;
+dt,
+dd {
+  line-height: 1.428571429;
 }
 
-.row-fluid .span2 {
-  width: 14.893617021276595%;
-  *width: 14.840425531914894%;
+dt {
+  font-weight: bold;
 }
 
-.row-fluid .span1 {
-  width: 6.382978723404255%;
-  *width: 6.329787234042553%;
+dd {
+  margin-left: 0;
 }
 
-.row-fluid .offset12 {
-  margin-left: 104.25531914893617%;
-  *margin-left: 104.14893617021275%;
+@media (min-width: 768px) {
+  .dl-horizontal dt {
+    float: left;
+    width: 160px;
+    overflow: hidden;
+    clear: left;
+    text-align: right;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .dl-horizontal dd {
+    margin-left: 180px;
+  }
+  .dl-horizontal dd:before,
+  .dl-horizontal dd:after {
+    display: table;
+    content: " ";
+  }
+  .dl-horizontal dd:after {
+    clear: both;
+  }
+  .dl-horizontal dd:before,
+  .dl-horizontal dd:after {
+    display: table;
+    content: " ";
+  }
+  .dl-horizontal dd:after {
+    clear: both;
+  }
 }
 
-.row-fluid .offset12:first-child {
-  margin-left: 102.12765957446808%;
-  *margin-left: 102.02127659574467%;
+abbr[title],
+abbr[data-original-title] {
+  cursor: help;
+  border-bottom: 1px dotted #999999;
 }
 
-.row-fluid .offset11 {
-  margin-left: 95.74468085106382%;
-  *margin-left: 95.6382978723404%;
+.initialism {
+  font-size: 90%;
+  text-transform: uppercase;
 }
 
-.row-fluid .offset11:first-child {
-  margin-left: 93.61702127659574%;
-  *margin-left: 93.51063829787232%;
+blockquote {
+  padding: 10px 20px;
+  margin: 0 0 20px;
+  border-left: 5px solid #eeeeee;
 }
 
-.row-fluid .offset10 {
-  margin-left: 87.23404255319149%;
-  *margin-left: 87.12765957446807%;
+blockquote p {
+  font-size: 17.5px;
+  font-weight: 300;
+  line-height: 1.25;
 }
 
-.row-fluid .offset10:first-child {
-  margin-left: 85.1063829787234%;
-  *margin-left: 84.99999999999999%;
+blockquote p:last-child {
+  margin-bottom: 0;
 }
 
-.row-fluid .offset9 {
-  margin-left: 78.72340425531914%;
-  *margin-left: 78.61702127659572%;
+blockquote small,
+blockquote .small {
+  display: block;
+  line-height: 1.428571429;
+  color: #999999;
 }
 
-.row-fluid .offset9:first-child {
-  margin-left: 76.59574468085106%;
-  *margin-left: 76.48936170212764%;
+blockquote small:before,
+blockquote .small:before {
+  content: '\2014 \00A0';
 }
 
-.row-fluid .offset8 {
-  margin-left: 70.2127659574468%;
-  *margin-left: 70.10638297872339%;
+blockquote.pull-right {
+  padding-right: 15px;
+  padding-left: 0;
+  border-right: 5px solid #eeeeee;
+  border-left: 0;
 }
 
-.row-fluid .offset8:first-child {
-  margin-left: 68.08510638297872%;
-  *margin-left: 67.9787234042553%;
+blockquote.pull-right p,
+blockquote.pull-right small,
+blockquote.pull-right .small {
+  text-align: right;
 }
 
-.row-fluid .offset7 {
-  margin-left: 61.70212765957446%;
-  *margin-left: 61.59574468085106%;
+blockquote.pull-right small:before,
+blockquote.pull-right .small:before {
+  content: '';
 }
 
-.row-fluid .offset7:first-child {
-  margin-left: 59.574468085106375%;
-  *margin-left: 59.46808510638297%;
+blockquote.pull-right small:after,
+blockquote.pull-right .small:after {
+  content: '\00A0 \2014';
 }
 
-.row-fluid .offset6 {
-  margin-left: 53.191489361702125%;
-  *margin-left: 53.085106382978715%;
+blockquote:before,
+blockquote:after {
+  content: "";
 }
 
-.row-fluid .offset6:first-child {
-  margin-left: 51.063829787234035%;
-  *margin-left: 50.95744680851063%;
+address {
+  margin-bottom: 20px;
+  font-style: normal;
+  line-height: 1.428571429;
 }
 
-.row-fluid .offset5 {
-  margin-left: 44.68085106382979%;
-  *margin-left: 44.57446808510638%;
+code,
+kbd,
+pre,
+samp {
+  font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
 }
 
-.row-fluid .offset5:first-child {
-  margin-left: 42.5531914893617%;
-  *margin-left: 42.4468085106383%;
+code {
+  padding: 2px 4px;
+  font-size: 90%;
+  color: #c7254e;
+  white-space: nowrap;
+  background-color: #f9f2f4;
+  border-radius: 4px;
 }
 
-.row-fluid .offset4 {
-  margin-left: 36.170212765957444%;
-  *margin-left: 36.06382978723405%;
+pre {
+  display: block;
+  padding: 9.5px;
+  margin: 0 0 10px;
+  font-size: 13px;
+  line-height: 1.428571429;
+  color: #333333;
+  word-break: break-all;
+  word-wrap: break-word;
+  background-color: #f5f5f5;
+  border: 1px solid #cccccc;
+  border-radius: 4px;
 }
 
-.row-fluid .offset4:first-child {
-  margin-left: 34.04255319148936%;
-  *margin-left: 33.93617021276596%;
+pre code {
+  padding: 0;
+  font-size: inherit;
+  color: inherit;
+  white-space: pre-wrap;
+  background-color: transparent;
+  border-radius: 0;
 }
 
-.row-fluid .offset3 {
-  margin-left: 27.659574468085104%;
-  *margin-left: 27.5531914893617%;
+.pre-scrollable {
+  max-height: 340px;
+  overflow-y: scroll;
 }
 
-.row-fluid .offset3:first-child {
-  margin-left: 25.53191489361702%;
-  *margin-left: 25.425531914893618%;
+.container {
+  padding-right: 15px;
+  padding-left: 15px;
+  margin-right: auto;
+  margin-left: auto;
 }
 
-.row-fluid .offset2 {
-  margin-left: 19.148936170212764%;
-  *margin-left: 19.04255319148936%;
+.container:before,
+.container:after {
+  display: table;
+  content: " ";
 }
 
-.row-fluid .offset2:first-child {
-  margin-left: 17.02127659574468%;
-  *margin-left: 16.914893617021278%;
+.container:after {
+  clear: both;
 }
 
-.row-fluid .offset1 {
-  margin-left: 10.638297872340425%;
-  *margin-left: 10.53191489361702%;
+.container:before,
+.container:after {
+  display: table;
+  content: " ";
 }
 
-.row-fluid .offset1:first-child {
-  margin-left: 8.51063829787234%;
-  *margin-left: 8.404255319148938%;
+.container:after {
+  clear: both;
 }
 
-[class*="span"].hide,
-.row-fluid [class*="span"].hide {
-  display: none;
+@media (min-width: 768px) {
+  .container {
+    width: 750px;
+  }
 }
 
-[class*="span"].pull-right,
-.row-fluid [class*="span"].pull-right {
-  float: right;
+@media (min-width: 992px) {
+  .container {
+    width: 970px;
+  }
 }
 
-.container {
-  margin-right: auto;
-  margin-left: auto;
-  *zoom: 1;
+@media (min-width: 1200px) {
+  .container {
+    width: 1170px;
+  }
 }
 
-.container:before,
-.container:after {
-  display: table;
-  line-height: 0;
-  content: "";
+.row {
+  margin-right: -15px;
+  margin-left: -15px;
 }
 
-.container:after {
-  clear: both;
+.row:before,
+.row:after {
+  display: table;
+  content: " ";
 }
 
-.container-fluid {
-  padding-right: 20px;
-  padding-left: 20px;
-  *zoom: 1;
+.row:after {
+  clear: both;
 }
 
-.container-fluid:before,
-.container-fluid:after {
+.row:before,
+.row:after {
   display: table;
-  line-height: 0;
-  content: "";
+  content: " ";
 }
 
-.container-fluid:after {
+.row:after {
   clear: both;
 }
 
-p {
-  margin: 0 0 10px;
+.col-xs-1,
+.col-sm-1,
+.col-md-1,
+.col-lg-1,
+.col-xs-2,
+.col-sm-2,
+.col-md-2,
+.col-lg-2,
+.col-xs-3,
+.col-sm-3,
+.col-md-3,
+.col-lg-3,
+.col-xs-4,
+.col-sm-4,
+.col-md-4,
+.col-lg-4,
+.col-xs-5,
+.col-sm-5,
+.col-md-5,
+.col-lg-5,
+.col-xs-6,
+.col-sm-6,
+.col-md-6,
+.col-lg-6,
+.col-xs-7,
+.col-sm-7,
+.col-md-7,
+.col-lg-7,
+.col-xs-8,
+.col-sm-8,
+.col-md-8,
+.col-lg-8,
+.col-xs-9,
+.col-sm-9,
+.col-md-9,
+.col-lg-9,
+.col-xs-10,
+.col-sm-10,
+.col-md-10,
+.col-lg-10,
+.col-xs-11,
+.col-sm-11,
+.col-md-11,
+.col-lg-11,
+.col-xs-12,
+.col-sm-12,
+.col-md-12,
+.col-lg-12 {
+  position: relative;
+  min-height: 1px;
+  padding-right: 15px;
+  padding-left: 15px;
 }
 
-.lead {
-  margin-bottom: 20px;
-  font-size: 21px;
-  font-weight: 200;
-  line-height: 30px;
+.col-xs-1,
+.col-xs-2,
+.col-xs-3,
+.col-xs-4,
+.col-xs-5,
+.col-xs-6,
+.col-xs-7,
+.col-xs-8,
+.col-xs-9,
+.col-xs-10,
+.col-xs-11,
+.col-xs-12 {
+  float: left;
 }
 
-small {
-  font-size: 85%;
+.col-xs-12 {
+  width: 100%;
 }
 
-strong {
-  font-weight: bold;
+.col-xs-11 {
+  width: 91.66666666666666%;
 }
 
-em {
-  font-style: italic;
+.col-xs-10 {
+  width: 83.33333333333334%;
 }
 
-cite {
-  font-style: normal;
+.col-xs-9 {
+  width: 75%;
 }
 
-.muted {
-  color: #999999;
+.col-xs-8 {
+  width: 66.66666666666666%;
 }
 
-a.muted:hover,
-a.muted:focus {
-  color: #808080;
+.col-xs-7 {
+  width: 58.333333333333336%;
 }
 
-.text-warning {
-  color: #c09853;
+.col-xs-6 {
+  width: 50%;
 }
 
-a.text-warning:hover,
-a.text-warning:focus {
-  color: #a47e3c;
+.col-xs-5 {
+  width: 41.66666666666667%;
 }
 
-.text-error {
-  color: #b94a48;
+.col-xs-4 {
+  width: 33.33333333333333%;
 }
 
-a.text-error:hover,
-a.text-error:focus {
-  color: #953b39;
+.col-xs-3 {
+  width: 25%;
 }
 
-.text-info {
-  color: #3a87ad;
+.col-xs-2 {
+  width: 16.666666666666664%;
 }
 
-a.text-info:hover,
-a.text-info:focus {
-  color: #2d6987;
+.col-xs-1 {
+  width: 8.333333333333332%;
 }
 
-.text-success {
-  color: #468847;
+.col-xs-pull-12 {
+  right: 100%;
 }
 
-a.text-success:hover,
-a.text-success:focus {
-  color: #356635;
+.col-xs-pull-11 {
+  right: 91.66666666666666%;
 }
 
-.text-left {
-  text-align: left;
+.col-xs-pull-10 {
+  right: 83.33333333333334%;
 }
 
-.text-right {
-  text-align: right;
+.col-xs-pull-9 {
+  right: 75%;
 }
 
-.text-center {
-  text-align: center;
+.col-xs-pull-8 {
+  right: 66.66666666666666%;
 }
 
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  margin: 10px 0;
-  font-family: inherit;
-  font-weight: bold;
-  line-height: 20px;
-  color: inherit;
-  text-rendering: optimizelegibility;
+.col-xs-pull-7 {
+  right: 58.333333333333336%;
 }
 
-h1 small,
-h2 small,
-h3 small,
-h4 small,
-h5 small,
-h6 small {
-  font-weight: normal;
-  line-height: 1;
-  color: #999999;
+.col-xs-pull-6 {
+  right: 50%;
 }
 
-h1,
-h2,
-h3 {
-  line-height: 40px;
+.col-xs-pull-5 {
+  right: 41.66666666666667%;
 }
 
-h1 {
-  font-size: 38.5px;
+.col-xs-pull-4 {
+  right: 33.33333333333333%;
 }
 
-h2 {
-  font-size: 31.5px;
+.col-xs-pull-3 {
+  right: 25%;
 }
 
-h3 {
-  font-size: 24.5px;
+.col-xs-pull-2 {
+  right: 16.666666666666664%;
 }
 
-h4 {
-  font-size: 17.5px;
+.col-xs-pull-1 {
+  right: 8.333333333333332%;
 }
 
-h5 {
-  font-size: 14px;
+.col-xs-pull-0 {
+  right: 0;
 }
 
-h6 {
-  font-size: 11.9px;
+.col-xs-push-12 {
+  left: 100%;
 }
 
-h1 small {
-  font-size: 24.5px;
+.col-xs-push-11 {
+  left: 91.66666666666666%;
 }
 
-h2 small {
-  font-size: 17.5px;
+.col-xs-push-10 {
+  left: 83.33333333333334%;
 }
 
-h3 small {
-  font-size: 14px;
+.col-xs-push-9 {
+  left: 75%;
 }
 
-h4 small {
-  font-size: 14px;
+.col-xs-push-8 {
+  left: 66.66666666666666%;
 }
 
-.page-header {
-  padding-bottom: 9px;
-  margin: 20px 0 30px;
-  border-bottom: 1px solid #eeeeee;
+.col-xs-push-7 {
+  left: 58.333333333333336%;
 }
 
-ul,
-ol {
-  padding: 0;
-  margin: 0 0 10px 25px;
+.col-xs-push-6 {
+  left: 50%;
 }
 
-ul ul,
-ul ol,
-ol ol,
-ol ul {
-  margin-bottom: 0;
+.col-xs-push-5 {
+  left: 41.66666666666667%;
 }
 
-li {
-  line-height: 20px;
+.col-xs-push-4 {
+  left: 33.33333333333333%;
 }
 
-ul.unstyled,
-ol.unstyled {
-  margin-left: 0;
-  list-style: none;
+.col-xs-push-3 {
+  left: 25%;
 }
 
-ul.inline,
-ol.inline {
-  margin-left: 0;
-  list-style: none;
+.col-xs-push-2 {
+  left: 16.666666666666664%;
 }
 
-ul.inline > li,
-ol.inline > li {
-  display: inline-block;
-  *display: inline;
-  padding-right: 5px;
-  padding-left: 5px;
-  *zoom: 1;
+.col-xs-push-1 {
+  left: 8.333333333333332%;
 }
 
-dl {
-  margin-bottom: 20px;
+.col-xs-push-0 {
+  left: 0;
 }
 
-dt,
-dd {
-  line-height: 20px;
+.col-xs-offset-12 {
+  margin-left: 100%;
 }
 
-dt {
-  font-weight: bold;
+.col-xs-offset-11 {
+  margin-left: 91.66666666666666%;
 }
 
-dd {
-  margin-left: 10px;
+.col-xs-offset-10 {
+  margin-left: 83.33333333333334%;
 }
 
-.dl-horizontal {
-  *zoom: 1;
+.col-xs-offset-9 {
+  margin-left: 75%;
 }
 
-.dl-horizontal:before,
-.dl-horizontal:after {
-  display: table;
-  line-height: 0;
-  content: "";
+.col-xs-offset-8 {
+  margin-left: 66.66666666666666%;
 }
 
-.dl-horizontal:after {
-  clear: both;
+.col-xs-offset-7 {
+  margin-left: 58.333333333333336%;
 }
 
-.dl-horizontal dt {
-  float: left;
-  width: 160px;
-  overflow: hidden;
-  clear: left;
-  text-align: right;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+.col-xs-offset-6 {
+  margin-left: 50%;
 }
 
-.dl-horizontal dd {
-  margin-left: 180px;
+.col-xs-offset-5 {
+  margin-left: 41.66666666666667%;
 }
 
-hr {
-  margin: 20px 0;
-  border: 0;
-  border-top: 1px solid #eeeeee;
-  border-bottom: 1px solid #ffffff;
+.col-xs-offset-4 {
+  margin-left: 33.33333333333333%;
 }
 
-abbr[title],
-abbr[data-original-title] {
-  cursor: help;
-  border-bottom: 1px dotted #999999;
+.col-xs-offset-3 {
+  margin-left: 25%;
 }
 
-abbr.initialism {
-  font-size: 90%;
-  text-transform: uppercase;
+.col-xs-offset-2 {
+  margin-left: 16.666666666666664%;
 }
 
-blockquote {
-  padding: 0 0 0 15px;
-  margin: 0 0 20px;
-  border-left: 5px solid #eeeeee;
+.col-xs-offset-1 {
+  margin-left: 8.333333333333332%;
 }
 
-blockquote p {
-  margin-bottom: 0;
-  font-size: 17.5px;
-  font-weight: 300;
-  line-height: 1.25;
+.col-xs-offset-0 {
+  margin-left: 0;
 }
 
-blockquote small {
+@media (min-width: 768px) {
+  .col-sm-1,
+  .col-sm-2,
+  .col-sm-3,
+  .col-sm-4,
+  .col-sm-5,
+  .col-sm-6,
+  .col-sm-7,
+  .col-sm-8,
+  .col-sm-9,
+  .col-sm-10,
+  .col-sm-11,
+  .col-sm-12 {
+    float: left;
+  }
+  .col-sm-12 {
+    width: 100%;
+  }
+  .col-sm-11 {
+    width: 91.66666666666666%;
+  }
+  .col-sm-10 {
+    width: 83.33333333333334%;
+  }
+  .col-sm-9 {
+    width: 75%;
+  }
+  .col-sm-8 {
+    width: 66.66666666666666%;
+  }
+  .col-sm-7 {
+    width: 58.333333333333336%;
+  }
+  .col-sm-6 {
+    width: 50%;
+  }
+  .col-sm-5 {
+    width: 41.66666666666667%;
+  }
+  .col-sm-4 {
+    width: 33.33333333333333%;
+  }
+  .col-sm-3 {
+    width: 25%;
+  }
+  .col-sm-2 {
+    width: 16.666666666666664%;
+  }
+  .col-sm-1 {
+    width: 8.333333333333332%;
+  }
+  .col-sm-pull-12 {
+    right: 100%;
+  }
+  .col-sm-pull-11 {
+    right: 91.66666666666666%;
+  }
+  .col-sm-pull-10 {
+    right: 83.33333333333334%;
+  }
+  .col-sm-pull-9 {
+    right: 75%;
+  }
+  .col-sm-pull-8 {
+    right: 66.66666666666666%;
+  }
+  .col-sm-pull-7 {
+    right: 58.333333333333336%;
+  }
+  .col-sm-pull-6 {
+    right: 50%;
+  }
+  .col-sm-pull-5 {
+    right: 41.66666666666667%;
+  }
+  .col-sm-pull-4 {
+    right: 33.33333333333333%;
+  }
+  .col-sm-pull-3 {
+    right: 25%;
+  }
+  .col-sm-pull-2 {
+    right: 16.666666666666664%;
+  }
+  .col-sm-pull-1 {
+    right: 8.333333333333332%;
+  }
+  .col-sm-pull-0 {
+    right: 0;
+  }
+  .col-sm-push-12 {
+    left: 100%;
+  }
+  .col-sm-push-11 {
+    left: 91.66666666666666%;
+  }
+  .col-sm-push-10 {
+    left: 83.33333333333334%;
+  }
+  .col-sm-push-9 {
+    left: 75%;
+  }
+  .col-sm-push-8 {
+    left: 66.66666666666666%;
+  }
+  .col-sm-push-7 {
+    left: 58.333333333333336%;
+  }
+  .col-sm-push-6 {
+    left: 50%;
+  }
+  .col-sm-push-5 {
+    left: 41.66666666666667%;
+  }
+  .col-sm-push-4 {
+    left: 33.33333333333333%;
+  }
+  .col-sm-push-3 {
+    left: 25%;
+  }
+  .col-sm-push-2 {
+    left: 16.666666666666664%;
+  }
+  .col-sm-push-1 {
+    left: 8.333333333333332%;
+  }
+  .col-sm-push-0 {
+    left: 0;
+  }
+  .col-sm-offset-12 {
+    margin-left: 100%;
+  }
+  .col-sm-offset-11 {
+    margin-left: 91.66666666666666%;
+  }
+  .col-sm-offset-10 {
+    margin-left: 83.33333333333334%;
+  }
+  .col-sm-offset-9 {
+    margin-left: 75%;
+  }
+  .col-sm-offset-8 {
+    margin-left: 66.66666666666666%;
+  }
+  .col-sm-offset-7 {
+    margin-left: 58.333333333333336%;
+  }
+  .col-sm-offset-6 {
+    margin-left: 50%;
+  }
+  .col-sm-offset-5 {
+    margin-left: 41.66666666666667%;
+  }
+  .col-sm-offset-4 {
+    margin-left: 33.33333333333333%;
+  }
+  .col-sm-offset-3 {
+    margin-left: 25%;
+  }
+  .col-sm-offset-2 {
+    margin-left: 16.666666666666664%;
+  }
+  .col-sm-offset-1 {
+    margin-left: 8.333333333333332%;
+  }
+  .col-sm-offset-0 {
+    margin-left: 0;
+  }
+}
+
+@media (min-width: 992px) {
+  .col-md-1,
+  .col-md-2,
+  .col-md-3,
+  .col-md-4,
+  .col-md-5,
+  .col-md-6,
+  .col-md-7,
+  .col-md-8,
+  .col-md-9,
+  .col-md-10,
+  .col-md-11,
+  .col-md-12 {
+    float: left;
+  }
+  .col-md-12 {
+    width: 100%;
+  }
+  .col-md-11 {
+    width: 91.66666666666666%;
+  }
+  .col-md-10 {
+    width: 83.33333333333334%;
+  }
+  .col-md-9 {
+    width: 75%;
+  }
+  .col-md-8 {
+    width: 66.66666666666666%;
+  }
+  .col-md-7 {
+    width: 58.333333333333336%;
+  }
+  .col-md-6 {
+    width: 50%;
+  }
+  .col-md-5 {
+    width: 41.66666666666667%;
+  }
+  .col-md-4 {
+    width: 33.33333333333333%;
+  }
+  .col-md-3 {
+    width: 25%;
+  }
+  .col-md-2 {
+    width: 16.666666666666664%;
+  }
+  .col-md-1 {
+    width: 8.333333333333332%;
+  }
+  .col-md-pull-12 {
+    right: 100%;
+  }
+  .col-md-pull-11 {
+    right: 91.66666666666666%;
+  }
+  .col-md-pull-10 {
+    right: 83.33333333333334%;
+  }
+  .col-md-pull-9 {
+    right: 75%;
+  }
+  .col-md-pull-8 {
+    right: 66.66666666666666%;
+  }
+  .col-md-pull-7 {
+    right: 58.333333333333336%;
+  }
+  .col-md-pull-6 {
+    right: 50%;
+  }
+  .col-md-pull-5 {
+    right: 41.66666666666667%;
+  }
+  .col-md-pull-4 {
+    right: 33.33333333333333%;
+  }
+  .col-md-pull-3 {
+    right: 25%;
+  }
+  .col-md-pull-2 {
+    right: 16.666666666666664%;
+  }
+  .col-md-pull-1 {
+    right: 8.333333333333332%;
+  }
+  .col-md-pull-0 {
+    right: 0;
+  }
+  .col-md-push-12 {
+    left: 100%;
+  }
+  .col-md-push-11 {
+    left: 91.66666666666666%;
+  }
+  .col-md-push-10 {
+    left: 83.33333333333334%;
+  }
+  .col-md-push-9 {
+    left: 75%;
+  }
+  .col-md-push-8 {
+    left: 66.66666666666666%;
+  }
+  .col-md-push-7 {
+    left: 58.333333333333336%;
+  }
+  .col-md-push-6 {
+    left: 50%;
+  }
+  .col-md-push-5 {
+    left: 41.66666666666667%;
+  }
+  .col-md-push-4 {
+    left: 33.33333333333333%;
+  }
+  .col-md-push-3 {
+    left: 25%;
+  }
+  .col-md-push-2 {
+    left: 16.666666666666664%;
+  }
+  .col-md-push-1 {
+    left: 8.333333333333332%;
+  }
+  .col-md-push-0 {
+    left: 0;
+  }
+  .col-md-offset-12 {
+    margin-left: 100%;
+  }
+  .col-md-offset-11 {
+    margin-left: 91.66666666666666%;
+  }
+  .col-md-offset-10 {
+    margin-left: 83.33333333333334%;
+  }
+  .col-md-offset-9 {
+    margin-left: 75%;
+  }
+  .col-md-offset-8 {
+    margin-left: 66.66666666666666%;
+  }
+  .col-md-offset-7 {
+    margin-left: 58.333333333333336%;
+  }
+  .col-md-offset-6 {
+    margin-left: 50%;
+  }
+  .col-md-offset-5 {
+    margin-left: 41.66666666666667%;
+  }
+  .col-md-offset-4 {
+    margin-left: 33.33333333333333%;
+  }
+  .col-md-offset-3 {
+    margin-left: 25%;
+  }
+  .col-md-offset-2 {
+    margin-left: 16.666666666666664%;
+  }
+  .col-md-offset-1 {
+    margin-left: 8.333333333333332%;
+  }
+  .col-md-offset-0 {
+    margin-left: 0;
+  }
+}
+
+@media (min-width: 1200px) {
+  .col-lg-1,
+  .col-lg-2,
+  .col-lg-3,
+  .col-lg-4,
+  .col-lg-5,
+  .col-lg-6,
+  .col-lg-7,
+  .col-lg-8,
+  .col-lg-9,
+  .col-lg-10,
+  .col-lg-11,
+  .col-lg-12 {
+    float: left;
+  }
+  .col-lg-12 {
+    width: 100%;
+  }
+  .col-lg-11 {
+    width: 91.66666666666666%;
+  }
+  .col-lg-10 {
+    width: 83.33333333333334%;
+  }
+  .col-lg-9 {
+    width: 75%;
+  }
+  .col-lg-8 {
+    width: 66.66666666666666%;
+  }
+  .col-lg-7 {
+    width: 58.333333333333336%;
+  }
+  .col-lg-6 {
+    width: 50%;
+  }
+  .col-lg-5 {
+    width: 41.66666666666667%;
+  }
+  .col-lg-4 {
+    width: 33.33333333333333%;
+  }
+  .col-lg-3 {
+    width: 25%;
+  }
+  .col-lg-2 {
+    width: 16.666666666666664%;
+  }
+  .col-lg-1 {
+    width: 8.333333333333332%;
+  }
+  .col-lg-pull-12 {
+    right: 100%;
+  }
+  .col-lg-pull-11 {
+    right: 91.66666666666666%;
+  }
+  .col-lg-pull-10 {
+    right: 83.33333333333334%;
+  }
+  .col-lg-pull-9 {
+    right: 75%;
+  }
+  .col-lg-pull-8 {
+    right: 66.66666666666666%;
+  }
+  .col-lg-pull-7 {
+    right: 58.333333333333336%;
+  }
+  .col-lg-pull-6 {
+    right: 50%;
+  }
+  .col-lg-pull-5 {
+    right: 41.66666666666667%;
+  }
+  .col-lg-pull-4 {
+    right: 33.33333333333333%;
+  }
+  .col-lg-pull-3 {
+    right: 25%;
+  }
+  .col-lg-pull-2 {
+    right: 16.666666666666664%;
+  }
+  .col-lg-pull-1 {
+    right: 8.333333333333332%;
+  }
+  .col-lg-pull-0 {
+    right: 0;
+  }
+  .col-lg-push-12 {
+    left: 100%;
+  }
+  .col-lg-push-11 {
+    left: 91.66666666666666%;
+  }
+  .col-lg-push-10 {
+    left: 83.33333333333334%;
+  }
+  .col-lg-push-9 {
+    left: 75%;
+  }
+  .col-lg-push-8 {
+    left: 66.66666666666666%;
+  }
+  .col-lg-push-7 {
+    left: 58.333333333333336%;
+  }
+  .col-lg-push-6 {
+    left: 50%;
+  }
+  .col-lg-push-5 {
+    left: 41.66666666666667%;
+  }
+  .col-lg-push-4 {
+    left: 33.33333333333333%;
+  }
+  .col-lg-push-3 {
+    left: 25%;
+  }
+  .col-lg-push-2 {
+    left: 16.666666666666664%;
+  }
+  .col-lg-push-1 {
+    left: 8.333333333333332%;
+  }
+  .col-lg-push-0 {
+    left: 0;
+  }
+  .col-lg-offset-12 {
+    margin-left: 100%;
+  }
+  .col-lg-offset-11 {
+    margin-left: 91.66666666666666%;
+  }
+  .col-lg-offset-10 {
+    margin-left: 83.33333333333334%;
+  }
+  .col-lg-offset-9 {
+    margin-left: 75%;
+  }
+  .col-lg-offset-8 {
+    margin-left: 66.66666666666666%;
+  }
+  .col-lg-offset-7 {
+    margin-left: 58.333333333333336%;
+  }
+  .col-lg-offset-6 {
+    margin-left: 50%;
+  }
+  .col-lg-offset-5 {
+    margin-left: 41.66666666666667%;
+  }
+  .col-lg-offset-4 {
+    margin-left: 33.33333333333333%;
+  }
+  .col-lg-offset-3 {
+    margin-left: 25%;
+  }
+  .col-lg-offset-2 {
+    margin-left: 16.666666666666664%;
+  }
+  .col-lg-offset-1 {
+    margin-left: 8.333333333333332%;
+  }
+  .col-lg-offset-0 {
+    margin-left: 0;
+  }
+}
+
+table {
+  max-width: 100%;
+  background-color: transparent;
+}
+
+th {
+  text-align: left;
+}
+
+.table {
+  width: 100%;
+  margin-bottom: 20px;
+}
+
+.table > thead > tr > th,
+.table > tbody > tr > th,
+.table > tfoot > tr > th,
+.table > thead > tr > td,
+.table > tbody > tr > td,
+.table > tfoot > tr > td {
+  padding: 8px;
+  line-height: 1.428571429;
+  vertical-align: top;
+  border-top: 1px solid #dddddd;
+}
+
+.table > thead > tr > th {
+  vertical-align: bottom;
+  border-bottom: 2px solid #dddddd;
+}
+
+.table > caption + thead > tr:first-child > th,
+.table > colgroup + thead > tr:first-child > th,
+.table > thead:first-child > tr:first-child > th,
+.table > caption + thead > tr:first-child > td,
+.table > colgroup + thead > tr:first-child > td,
+.table > thead:first-child > tr:first-child > td {
+  border-top: 0;
+}
+
+.table > tbody + tbody {
+  border-top: 2px solid #dddddd;
+}
+
+.table .table {
+  background-color: #ffffff;
+}
+
+.table-condensed > thead > tr > th,
+.table-condensed > tbody > tr > th,
+.table-condensed > tfoot > tr > th,
+.table-condensed > thead > tr > td,
+.table-condensed > tbody > tr > td,
+.table-condensed > tfoot > tr > td {
+  padding: 5px;
+}
+
+.table-bordered {
+  border: 1px solid #dddddd;
+}
+
+.table-bordered > thead > tr > th,
+.table-bordered > tbody > tr > th,
+.table-bordered > tfoot > tr > th,
+.table-bordered > thead > tr > td,
+.table-bordered > tbody > tr > td,
+.table-bordered > tfoot > tr > td {
+  border: 1px solid #dddddd;
+}
+
+.table-bordered > thead > tr > th,
+.table-bordered > thead > tr > td {
+  border-bottom-width: 2px;
+}
+
+.table-striped > tbody > tr:nth-child(odd) > td,
+.table-striped > tbody > tr:nth-child(odd) > th {
+  background-color: #f9f9f9;
+}
+
+.table-hover > tbody > tr:hover > td,
+.table-hover > tbody > tr:hover > th {
+  background-color: #f5f5f5;
+}
+
+table col[class*="col-"] {
+  position: static;
+  display: table-column;
+  float: none;
+}
+
+table td[class*="col-"],
+table th[class*="col-"] {
+  display: table-cell;
+  float: none;
+}
+
+.table > thead > tr > .active,
+.table > tbody > tr > .active,
+.table > tfoot > tr > .active,
+.table > thead > .active > td,
+.table > tbody > .active > td,
+.table > tfoot > .active > td,
+.table > thead > .active > th,
+.table > tbody > .active > th,
+.table > tfoot > .active > th {
+  background-color: #f5f5f5;
+}
+
+.table-hover > tbody > tr > .active:hover,
+.table-hover > tbody > .active:hover > td,
+.table-hover > tbody > .active:hover > th {
+  background-color: #e8e8e8;
+}
+
+.table > thead > tr > .success,
+.table > tbody > tr > .success,
+.table > tfoot > tr > .success,
+.table > thead > .success > td,
+.table > tbody > .success > td,
+.table > tfoot > .success > td,
+.table > thead > .success > th,
+.table > tbody > .success > th,
+.table > tfoot > .success > th {
+  background-color: #dff0d8;
+}
+
+.table-hover > tbody > tr > .success:hover,
+.table-hover > tbody > .success:hover > td,
+.table-hover > tbody > .success:hover > th {
+  background-color: #d0e9c6;
+}
+
+.table > thead > tr > .danger,
+.table > tbody > tr > .danger,
+.table > tfoot > tr > .danger,
+.table > thead > .danger > td,
+.table > tbody > .danger > td,
+.table > tfoot > .danger > td,
+.table > thead > .danger > th,
+.table > tbody > .danger > th,
+.table > tfoot > .danger > th {
+  background-color: #f2dede;
+}
+
+.table-hover > tbody > tr > .danger:hover,
+.table-hover > tbody > .danger:hover > td,
+.table-hover > tbody > .danger:hover > th {
+  background-color: #ebcccc;
+}
+
+.table > thead > tr > .warning,
+.table > tbody > tr > .warning,
+.table > tfoot > tr > .warning,
+.table > thead > .warning > td,
+.table > tbody > .warning > td,
+.table > tfoot > .warning > td,
+.table > thead > .warning > th,
+.table > tbody > .warning > th,
+.table > tfoot > .warning > th {
+  background-color: #fcf8e3;
+}
+
+.table-hover > tbody > tr > .warning:hover,
+.table-hover > tbody > .warning:hover > td,
+.table-hover > tbody > .warning:hover > th {
+  background-color: #faf2cc;
+}
+
+@media (max-width: 767px) {
+  .table-responsive {
+    width: 100%;
+    margin-bottom: 15px;
+    overflow-x: scroll;
+    overflow-y: hidden;
+    border: 1px solid #dddddd;
+    -ms-overflow-style: -ms-autohiding-scrollbar;
+    -webkit-overflow-scrolling: touch;
+  }
+  .table-responsive > .table {
+    margin-bottom: 0;
+  }
+  .table-responsive > .table > thead > tr > th,
+  .table-responsive > .table > tbody > tr > th,
+  .table-responsive > .table > tfoot > tr > th,
+  .table-responsive > .table > thead > tr > td,
+  .table-responsive > .table > tbody > tr > td,
+  .table-responsive > .table > tfoot > tr > td {
+    white-space: nowrap;
+  }
+  .table-responsive > .table-bordered {
+    border: 0;
+  }
+  .table-responsive > .table-bordered > thead > tr > th:first-child,
+  .table-responsive > .table-bordered > tbody > tr > th:first-child,
+  .table-responsive > .table-bordered > tfoot > tr > th:first-child,
+  .table-responsive > .table-bordered > thead > tr > td:first-child,
+  .table-responsive > .table-bordered > tbody > tr > td:first-child,
+  .table-responsive > .table-bordered > tfoot > tr > td:first-child {
+    border-left: 0;
+  }
+  .table-responsive > .table-bordered > thead > tr > th:last-child,
+  .table-responsive > .table-bordered > tbody > tr > th:last-child,
+  .table-responsive > .table-bordered > tfoot > tr > th:last-child,
+  .table-responsive > .table-bordered > thead > tr > td:last-child,
+  .table-responsive > .table-bordered > tbody > tr > td:last-child,
+  .table-responsive > .table-bordered > tfoot > tr > td:last-child {
+    border-right: 0;
+  }
+  .table-responsive > .table-bordered > tbody > tr:last-child > th,
+  .table-responsive > .table-bordered > tfoot > tr:last-child > th,
+  .table-responsive > .table-bordered > tbody > tr:last-child > td,
+  .table-responsive > .table-bordered > tfoot > tr:last-child > td {
+    border-bottom: 0;
+  }
+}
+
+fieldset {
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+
+legend {
+  display: block;
+  width: 100%;
+  padding: 0;
+  margin-bottom: 20px;
+  font-size: 21px;
+  line-height: inherit;
+  color: #333333;
+  border: 0;
+  border-bottom: 1px solid #e5e5e5;
+}
+
+label {
+  display: inline-block;
+  margin-bottom: 5px;
+  font-weight: bold;
+}
+
+input[type="search"] {
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+input[type="radio"],
+input[type="checkbox"] {
+  margin: 4px 0 0;
+  margin-top: 1px \9;
+  /* IE8-9 */
+
+  line-height: normal;
+}
+
+input[type="file"] {
+  display: block;
+}
+
+select[multiple],
+select[size] {
+  height: auto;
+}
+
+select optgroup {
+  font-family: inherit;
+  font-size: inherit;
+  font-style: inherit;
+}
+
+input[type="file"]:focus,
+input[type="radio"]:focus,
+input[type="checkbox"]:focus {
+  outline: thin dotted;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+input[type="number"]::-webkit-outer-spin-button,
+input[type="number"]::-webkit-inner-spin-button {
+  height: auto;
+}
+
+output {
   display: block;
-  line-height: 20px;
+  padding-top: 7px;
+  font-size: 14px;
+  line-height: 1.428571429;
+  color: #555555;
+  vertical-align: middle;
+}
+
+.form-control {
+  display: block;
+  width: 100%;
+  height: 34px;
+  padding: 6px 12px;
+  font-size: 14px;
+  line-height: 1.428571429;
+  color: #555555;
+  vertical-align: middle;
+  background-color: #ffffff;
+  background-image: none;
+  border: 1px solid #cccccc;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
+          transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
+}
+
+.form-control:focus {
+  border-color: #66afe9;
+  outline: 0;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
+}
+
+.form-control:-moz-placeholder {
   color: #999999;
 }
 
-blockquote small:before {
-  content: '\2014 \00A0';
+.form-control::-moz-placeholder {
+  color: #999999;
+  opacity: 1;
 }
 
-blockquote.pull-right {
-  float: right;
-  padding-right: 15px;
-  padding-left: 0;
-  border-right: 5px solid #eeeeee;
-  border-left: 0;
+.form-control:-ms-input-placeholder {
+  color: #999999;
 }
 
-blockquote.pull-right p,
-blockquote.pull-right small {
-  text-align: right;
+.form-control::-webkit-input-placeholder {
+  color: #999999;
 }
 
-blockquote.pull-right small:before {
-  content: '';
+.form-control[disabled],
+.form-control[readonly],
+fieldset[disabled] .form-control {
+  cursor: not-allowed;
+  background-color: #eeeeee;
 }
 
-blockquote.pull-right small:after {
-  content: '\00A0 \2014';
+textarea.form-control {
+  height: auto;
 }
 
-q:before,
-q:after,
-blockquote:before,
-blockquote:after {
-  content: "";
+.form-group {
+  margin-bottom: 15px;
 }
 
-address {
+.radio,
+.checkbox {
   display: block;
-  margin-bottom: 20px;
-  font-style: normal;
-  line-height: 20px;
+  min-height: 20px;
+  padding-left: 20px;
+  margin-top: 10px;
+  margin-bottom: 10px;
+  vertical-align: middle;
+}
+
+.radio label,
+.checkbox label {
+  display: inline;
+  margin-bottom: 0;
+  font-weight: normal;
+  cursor: pointer;
+}
+
+.radio input[type="radio"],
+.radio-inline input[type="radio"],
+.checkbox input[type="checkbox"],
+.checkbox-inline input[type="checkbox"] {
+  float: left;
+  margin-left: -20px;
+}
+
+.radio + .radio,
+.checkbox + .checkbox {
+  margin-top: -5px;
+}
+
+.radio-inline,
+.checkbox-inline {
+  display: inline-block;
+  padding-left: 20px;
+  margin-bottom: 0;
+  font-weight: normal;
+  vertical-align: middle;
+  cursor: pointer;
+}
+
+.radio-inline + .radio-inline,
+.checkbox-inline + .checkbox-inline {
+  margin-top: 0;
+  margin-left: 10px;
+}
+
+input[type="radio"][disabled],
+input[type="checkbox"][disabled],
+.radio[disabled],
+.radio-inline[disabled],
+.checkbox[disabled],
+.checkbox-inline[disabled],
+fieldset[disabled] input[type="radio"],
+fieldset[disabled] input[type="checkbox"],
+fieldset[disabled] .radio,
+fieldset[disabled] .radio-inline,
+fieldset[disabled] .checkbox,
+fieldset[disabled] .checkbox-inline {
+  cursor: not-allowed;
+}
+
+.input-sm {
+  height: 30px;
+  padding: 5px 10px;
+  font-size: 12px;
+  line-height: 1.5;
+  border-radius: 3px;
+}
+
+select.input-sm {
+  height: 30px;
+  line-height: 30px;
+}
+
+textarea.input-sm {
+  height: auto;
+}
+
+.input-lg {
+  height: 46px;
+  padding: 10px 16px;
+  font-size: 18px;
+  line-height: 1.33;
+  border-radius: 6px;
+}
+
+select.input-lg {
+  height: 46px;
+  line-height: 46px;
+}
+
+textarea.input-lg {
+  height: auto;
+}
+
+.has-warning .help-block,
+.has-warning .control-label,
+.has-warning .radio,
+.has-warning .checkbox,
+.has-warning .radio-inline,
+.has-warning .checkbox-inline {
+  color: #8a6d3b;
+}
+
+.has-warning .form-control {
+  border-color: #8a6d3b;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.has-warning .form-control:focus {
+  border-color: #66512c;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
+}
+
+.has-warning .input-group-addon {
+  color: #8a6d3b;
+  background-color: #fcf8e3;
+  border-color: #8a6d3b;
+}
+
+.has-error .help-block,
+.has-error .control-label,
+.has-error .radio,
+.has-error .checkbox,
+.has-error .radio-inline,
+.has-error .checkbox-inline {
+  color: #a94442;
+}
+
+.has-error .form-control {
+  border-color: #a94442;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.has-error .form-control:focus {
+  border-color: #843534;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
+}
+
+.has-error .input-group-addon {
+  color: #a94442;
+  background-color: #f2dede;
+  border-color: #a94442;
+}
+
+.has-success .help-block,
+.has-success .control-label,
+.has-success .radio,
+.has-success .checkbox,
+.has-success .radio-inline,
+.has-success .checkbox-inline {
+  color: #3c763d;
+}
+
+.has-success .form-control {
+  border-color: #3c763d;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.has-success .form-control:focus {
+  border-color: #2b542c;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
+}
+
+.has-success .input-group-addon {
+  color: #3c763d;
+  background-color: #dff0d8;
+  border-color: #3c763d;
+}
+
+.form-control-static {
+  margin-bottom: 0;
+}
+
+.help-block {
+  display: block;
+  margin-top: 5px;
+  margin-bottom: 10px;
+  color: #737373;
+}
+
+@media (min-width: 768px) {
+  .form-inline .form-group {
+    display: inline-block;
+    margin-bottom: 0;
+    vertical-align: middle;
+  }
+  .form-inline .form-control {
+    display: inline-block;
+  }
+  .form-inline select.form-control {
+    width: auto;
+  }
+  .form-inline .radio,
+  .form-inline .checkbox {
+    display: inline-block;
+    padding-left: 0;
+    margin-top: 0;
+    margin-bottom: 0;
+  }
+  .form-inline .radio input[type="radio"],
+  .form-inline .checkbox input[type="checkbox"] {
+    float: none;
+    margin-left: 0;
+  }
+}
+
+.form-horizontal .control-label,
+.form-horizontal .radio,
+.form-horizontal .checkbox,
+.form-horizontal .radio-inline,
+.form-horizontal .checkbox-inline {
+  padding-top: 7px;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+.form-horizontal .radio,
+.form-horizontal .checkbox {
+  min-height: 27px;
+}
+
+.form-horizontal .form-group {
+  margin-right: -15px;
+  margin-left: -15px;
+}
+
+.form-horizontal .form-group:before,
+.form-horizontal .form-group:after {
+  display: table;
+  content: " ";
+}
+
+.form-horizontal .form-group:after {
+  clear: both;
+}
+
+.form-horizontal .form-group:before,
+.form-horizontal .form-group:after {
+  display: table;
+  content: " ";
+}
+
+.form-horizontal .form-group:after {
+  clear: both;
+}
+
+.form-horizontal .form-control-static {
+  padding-top: 7px;
+}
+
+@media (min-width: 768px) {
+  .form-horizontal .control-label {
+    text-align: right;
+  }
+}
+
+.btn {
+  display: inline-block;
+  padding: 6px 12px;
+  margin-bottom: 0;
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 1.428571429;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: middle;
+  cursor: pointer;
+  background-image: none;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+      -ms-user-select: none;
+       -o-user-select: none;
+          user-select: none;
+}
+
+.btn:focus {
+  outline: thin dotted;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+.btn:hover,
+.btn:focus {
+  color: #333333;
+  text-decoration: none;
+}
+
+.btn:active,
+.btn.active {
+  background-image: none;
+  outline: 0;
+  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+          box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+}
+
+.btn.disabled,
+.btn[disabled],
+fieldset[disabled] .btn {
+  pointer-events: none;
+  cursor: not-allowed;
+  opacity: 0.65;
+  filter: alpha(opacity=65);
+  -webkit-box-shadow: none;
+          box-shadow: none;
+}
+
+.btn-default {
+  color: #333333;
+  background-color: #ffffff;
+  border-color: #cccccc;
+}
+
+.btn-default:hover,
+.btn-default:focus,
+.btn-default:active,
+.btn-default.active,
+.open .dropdown-toggle.btn-default {
+  color: #333333;
+  background-color: #ebebeb;
+  border-color: #adadad;
+}
+
+.btn-default:active,
+.btn-default.active,
+.open .dropdown-toggle.btn-default {
+  background-image: none;
+}
+
+.btn-default.disabled,
+.btn-default[disabled],
+fieldset[disabled] .btn-default,
+.btn-default.disabled:hover,
+.btn-default[disabled]:hover,
+fieldset[disabled] .btn-default:hover,
+.btn-default.disabled:focus,
+.btn-default[disabled]:focus,
+fieldset[disabled] .btn-default:focus,
+.btn-default.disabled:active,
+.btn-default[disabled]:active,
+fieldset[disabled] .btn-default:active,
+.btn-default.disabled.active,
+.btn-default[disabled].active,
+fieldset[disabled] .btn-default.active {
+  background-color: #ffffff;
+  border-color: #cccccc;
+}
+
+.btn-default .badge {
+  color: #ffffff;
+  background-color: #fff;
+}
+
+.btn-primary {
+  color: #ffffff;
+  background-color: #428bca;
+  border-color: #357ebd;
+}
+
+.btn-primary:hover,
+.btn-primary:focus,
+.btn-primary:active,
+.btn-primary.active,
+.open .dropdown-toggle.btn-primary {
+  color: #ffffff;
+  background-color: #3276b1;
+  border-color: #285e8e;
 }
 
-code,
-pre {
-  padding: 0 3px 2px;
-  font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
-  font-size: 12px;
-  color: #333333;
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-          border-radius: 3px;
+.btn-primary:active,
+.btn-primary.active,
+.open .dropdown-toggle.btn-primary {
+  background-image: none;
 }
 
-code {
-  padding: 2px 4px;
-  color: #d14;
-  white-space: nowrap;
-  background-color: #f7f7f9;
-  border: 1px solid #e1e1e8;
+.btn-primary.disabled,
+.btn-primary[disabled],
+fieldset[disabled] .btn-primary,
+.btn-primary.disabled:hover,
+.btn-primary[disabled]:hover,
+fieldset[disabled] .btn-primary:hover,
+.btn-primary.disabled:focus,
+.btn-primary[disabled]:focus,
+fieldset[disabled] .btn-primary:focus,
+.btn-primary.disabled:active,
+.btn-primary[disabled]:active,
+fieldset[disabled] .btn-primary:active,
+.btn-primary.disabled.active,
+.btn-primary[disabled].active,
+fieldset[disabled] .btn-primary.active {
+  background-color: #428bca;
+  border-color: #357ebd;
+}
+
+.btn-primary .badge {
+  color: #428bca;
+  background-color: #fff;
 }
 
-pre {
-  display: block;
-  padding: 9.5px;
-  margin: 0 0 10px;
-  font-size: 13px;
-  line-height: 20px;
-  word-break: break-all;
-  word-wrap: break-word;
-  white-space: pre;
-  white-space: pre-wrap;
-  background-color: #f5f5f5;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
+.btn-warning {
+  color: #ffffff;
+  background-color: #f0ad4e;
+  border-color: #eea236;
 }
 
-pre.prettyprint {
-  margin-bottom: 20px;
+.btn-warning:hover,
+.btn-warning:focus,
+.btn-warning:active,
+.btn-warning.active,
+.open .dropdown-toggle.btn-warning {
+  color: #ffffff;
+  background-color: #ed9c28;
+  border-color: #d58512;
 }
 
-pre code {
-  padding: 0;
-  color: inherit;
-  white-space: pre;
-  white-space: pre-wrap;
-  background-color: transparent;
-  border: 0;
+.btn-warning:active,
+.btn-warning.active,
+.open .dropdown-toggle.btn-warning {
+  background-image: none;
 }
 
-.pre-scrollable {
-  max-height: 340px;
-  overflow-y: scroll;
+.btn-warning.disabled,
+.btn-warning[disabled],
+fieldset[disabled] .btn-warning,
+.btn-warning.disabled:hover,
+.btn-warning[disabled]:hover,
+fieldset[disabled] .btn-warning:hover,
+.btn-warning.disabled:focus,
+.btn-warning[disabled]:focus,
+fieldset[disabled] .btn-warning:focus,
+.btn-warning.disabled:active,
+.btn-warning[disabled]:active,
+fieldset[disabled] .btn-warning:active,
+.btn-warning.disabled.active,
+.btn-warning[disabled].active,
+fieldset[disabled] .btn-warning.active {
+  background-color: #f0ad4e;
+  border-color: #eea236;
+}
+
+.btn-warning .badge {
+  color: #f0ad4e;
+  background-color: #fff;
 }
 
-form {
-  margin: 0 0 20px;
+.btn-danger {
+  color: #ffffff;
+  background-color: #d9534f;
+  border-color: #d43f3a;
 }
 
-fieldset {
-  padding: 0;
-  margin: 0;
-  border: 0;
+.btn-danger:hover,
+.btn-danger:focus,
+.btn-danger:active,
+.btn-danger.active,
+.open .dropdown-toggle.btn-danger {
+  color: #ffffff;
+  background-color: #d2322d;
+  border-color: #ac2925;
 }
 
-legend {
-  display: block;
-  width: 100%;
-  padding: 0;
-  margin-bottom: 20px;
-  font-size: 21px;
-  line-height: 40px;
-  color: #333333;
-  border: 0;
-  border-bottom: 1px solid #e5e5e5;
+.btn-danger:active,
+.btn-danger.active,
+.open .dropdown-toggle.btn-danger {
+  background-image: none;
 }
 
-legend small {
-  font-size: 15px;
-  color: #999999;
+.btn-danger.disabled,
+.btn-danger[disabled],
+fieldset[disabled] .btn-danger,
+.btn-danger.disabled:hover,
+.btn-danger[disabled]:hover,
+fieldset[disabled] .btn-danger:hover,
+.btn-danger.disabled:focus,
+.btn-danger[disabled]:focus,
+fieldset[disabled] .btn-danger:focus,
+.btn-danger.disabled:active,
+.btn-danger[disabled]:active,
+fieldset[disabled] .btn-danger:active,
+.btn-danger.disabled.active,
+.btn-danger[disabled].active,
+fieldset[disabled] .btn-danger.active {
+  background-color: #d9534f;
+  border-color: #d43f3a;
+}
+
+.btn-danger .badge {
+  color: #d9534f;
+  background-color: #fff;
 }
 
-label,
-input,
-button,
-select,
-textarea {
-  font-size: 14px;
-  font-weight: normal;
-  line-height: 20px;
+.btn-success {
+  color: #ffffff;
+  background-color: #5cb85c;
+  border-color: #4cae4c;
 }
 
-input,
-button,
-select,
-textarea {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+.btn-success:hover,
+.btn-success:focus,
+.btn-success:active,
+.btn-success.active,
+.open .dropdown-toggle.btn-success {
+  color: #ffffff;
+  background-color: #47a447;
+  border-color: #398439;
 }
 
-label {
-  display: block;
-  margin-bottom: 5px;
+.btn-success:active,
+.btn-success.active,
+.open .dropdown-toggle.btn-success {
+  background-image: none;
 }
 
-select,
-textarea,
-input[type="text"],
-input[type="password"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="date"],
-input[type="month"],
-input[type="time"],
-input[type="week"],
-input[type="number"],
-input[type="email"],
-input[type="url"],
-input[type="search"],
-input[type="tel"],
-input[type="color"],
-.uneditable-input {
-  display: inline-block;
-  height: 20px;
-  padding: 4px 6px;
-  margin-bottom: 10px;
-  font-size: 14px;
-  line-height: 20px;
-  color: #555555;
-  vertical-align: middle;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
+.btn-success.disabled,
+.btn-success[disabled],
+fieldset[disabled] .btn-success,
+.btn-success.disabled:hover,
+.btn-success[disabled]:hover,
+fieldset[disabled] .btn-success:hover,
+.btn-success.disabled:focus,
+.btn-success[disabled]:focus,
+fieldset[disabled] .btn-success:focus,
+.btn-success.disabled:active,
+.btn-success[disabled]:active,
+fieldset[disabled] .btn-success:active,
+.btn-success.disabled.active,
+.btn-success[disabled].active,
+fieldset[disabled] .btn-success.active {
+  background-color: #5cb85c;
+  border-color: #4cae4c;
+}
+
+.btn-success .badge {
+  color: #5cb85c;
+  background-color: #fff;
 }
 
-input,
-textarea,
-.uneditable-input {
-  width: 206px;
+.btn-info {
+  color: #ffffff;
+  background-color: #5bc0de;
+  border-color: #46b8da;
 }
 
-textarea {
-  height: auto;
+.btn-info:hover,
+.btn-info:focus,
+.btn-info:active,
+.btn-info.active,
+.open .dropdown-toggle.btn-info {
+  color: #ffffff;
+  background-color: #39b3d7;
+  border-color: #269abc;
 }
 
-textarea,
-input[type="text"],
-input[type="password"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="date"],
-input[type="month"],
-input[type="time"],
-input[type="week"],
-input[type="number"],
-input[type="email"],
-input[type="url"],
-input[type="search"],
-input[type="tel"],
-input[type="color"],
-.uneditable-input {
-  background-color: #ffffff;
-  border: 1px solid #cccccc;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
-     -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
-       -o-transition: border linear 0.2s, box-shadow linear 0.2s;
-          transition: border linear 0.2s, box-shadow linear 0.2s;
-}
-
-textarea:focus,
-input[type="text"]:focus,
-input[type="password"]:focus,
-input[type="datetime"]:focus,
-input[type="datetime-local"]:focus,
-input[type="date"]:focus,
-input[type="month"]:focus,
-input[type="time"]:focus,
-input[type="week"]:focus,
-input[type="number"]:focus,
-input[type="email"]:focus,
-input[type="url"]:focus,
-input[type="search"]:focus,
-input[type="tel"]:focus,
-input[type="color"]:focus,
-.uneditable-input:focus {
-  border-color: rgba(82, 168, 236, 0.8);
-  outline: 0;
-  outline: thin dotted \9;
-  /* IE6-9 */
+.btn-info:active,
+.btn-info.active,
+.open .dropdown-toggle.btn-info {
+  background-image: none;
+}
 
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+.btn-info.disabled,
+.btn-info[disabled],
+fieldset[disabled] .btn-info,
+.btn-info.disabled:hover,
+.btn-info[disabled]:hover,
+fieldset[disabled] .btn-info:hover,
+.btn-info.disabled:focus,
+.btn-info[disabled]:focus,
+fieldset[disabled] .btn-info:focus,
+.btn-info.disabled:active,
+.btn-info[disabled]:active,
+fieldset[disabled] .btn-info:active,
+.btn-info.disabled.active,
+.btn-info[disabled].active,
+fieldset[disabled] .btn-info.active {
+  background-color: #5bc0de;
+  border-color: #46b8da;
 }
 
-input[type="radio"],
-input[type="checkbox"] {
-  margin: 4px 0 0;
-  margin-top: 1px \9;
-  *margin-top: 0;
-  line-height: normal;
+.btn-info .badge {
+  color: #5bc0de;
+  background-color: #fff;
 }
 
-input[type="file"],
-input[type="image"],
-input[type="submit"],
-input[type="reset"],
-input[type="button"],
-input[type="radio"],
-input[type="checkbox"] {
-  width: auto;
+.btn-link {
+  font-weight: normal;
+  color: #428bca;
+  cursor: pointer;
+  border-radius: 0;
 }
 
-select,
-input[type="file"] {
-  height: 30px;
-  /* In IE7, the height of the select element cannot be changed by height, only font-size */
+.btn-link,
+.btn-link:active,
+.btn-link[disabled],
+fieldset[disabled] .btn-link {
+  background-color: transparent;
+  -webkit-box-shadow: none;
+          box-shadow: none;
+}
 
-  *margin-top: 4px;
-  /* For IE7, add top margin to align select with labels */
+.btn-link,
+.btn-link:hover,
+.btn-link:focus,
+.btn-link:active {
+  border-color: transparent;
+}
 
-  line-height: 30px;
+.btn-link:hover,
+.btn-link:focus {
+  color: #2a6496;
+  text-decoration: underline;
+  background-color: transparent;
 }
 
-select {
-  width: 220px;
-  background-color: #ffffff;
-  border: 1px solid #cccccc;
+.btn-link[disabled]:hover,
+fieldset[disabled] .btn-link:hover,
+.btn-link[disabled]:focus,
+fieldset[disabled] .btn-link:focus {
+  color: #999999;
+  text-decoration: none;
 }
 
-select[multiple],
-select[size] {
-  height: auto;
+.btn-lg {
+  padding: 10px 16px;
+  font-size: 18px;
+  line-height: 1.33;
+  border-radius: 6px;
 }
 
-select:focus,
-input[type="file"]:focus,
-input[type="radio"]:focus,
-input[type="checkbox"]:focus {
-  outline: thin dotted #333;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
+.btn-sm {
+  padding: 5px 10px;
+  font-size: 12px;
+  line-height: 1.5;
+  border-radius: 3px;
 }
 
-.uneditable-input,
-.uneditable-textarea {
-  color: #999999;
-  cursor: not-allowed;
-  background-color: #fcfcfc;
-  border-color: #cccccc;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+.btn-xs {
+  padding: 1px 5px;
+  font-size: 12px;
+  line-height: 1.5;
+  border-radius: 3px;
 }
 
-.uneditable-input {
-  overflow: hidden;
-  white-space: nowrap;
+.btn-block {
+  display: block;
+  width: 100%;
+  padding-right: 0;
+  padding-left: 0;
 }
 
-.uneditable-textarea {
-  width: auto;
-  height: auto;
+.btn-block + .btn-block {
+  margin-top: 5px;
 }
 
-input:-moz-placeholder,
-textarea:-moz-placeholder {
-  color: #999999;
+input[type="submit"].btn-block,
+input[type="reset"].btn-block,
+input[type="button"].btn-block {
+  width: 100%;
 }
 
-input:-ms-input-placeholder,
-textarea:-ms-input-placeholder {
-  color: #999999;
+.fade {
+  opacity: 0;
+  -webkit-transition: opacity 0.15s linear;
+          transition: opacity 0.15s linear;
 }
 
-input::-webkit-input-placeholder,
-textarea::-webkit-input-placeholder {
-  color: #999999;
+.fade.in {
+  opacity: 1;
 }
 
-.radio,
-.checkbox {
-  min-height: 20px;
-  padding-left: 20px;
+.collapse {
+  display: none;
 }
 
-.radio input[type="radio"],
-.checkbox input[type="checkbox"] {
-  float: left;
-  margin-left: -20px;
+.collapse.in {
+  display: block;
 }
 
-.controls > .radio:first-child,
-.controls > .checkbox:first-child {
-  padding-top: 5px;
+.collapsing {
+  position: relative;
+  height: 0;
+  overflow: hidden;
+  -webkit-transition: height 0.35s ease;
+          transition: height 0.35s ease;
 }
 
-.radio.inline,
-.checkbox.inline {
-  display: inline-block;
-  padding-top: 5px;
-  margin-bottom: 0;
-  vertical-align: middle;
+@font-face {
+  font-family: 'Glyphicons Halflings';
+  src: url('../fonts/glyphicons-halflings-regular.eot');
+  src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg');
 }
 
-.radio.inline + .radio.inline,
-.checkbox.inline + .checkbox.inline {
-  margin-left: 10px;
+.glyphicon {
+  position: relative;
+  top: 1px;
+  display: inline-block;
+  font-family: 'Glyphicons Halflings';
+  -webkit-font-smoothing: antialiased;
+  font-style: normal;
+  font-weight: normal;
+  line-height: 1;
+  -moz-osx-font-smoothing: grayscale;
 }
 
-.input-mini {
-  width: 60px;
+.glyphicon:empty {
+  width: 1em;
 }
 
-.input-small {
-  width: 90px;
+.glyphicon-asterisk:before {
+  content: "\2a";
 }
 
-.input-medium {
-  width: 150px;
+.glyphicon-plus:before {
+  content: "\2b";
 }
 
-.input-large {
-  width: 210px;
+.glyphicon-euro:before {
+  content: "\20ac";
 }
 
-.input-xlarge {
-  width: 270px;
+.glyphicon-minus:before {
+  content: "\2212";
 }
 
-.input-xxlarge {
-  width: 530px;
+.glyphicon-cloud:before {
+  content: "\2601";
 }
 
-input[class*="span"],
-select[class*="span"],
-textarea[class*="span"],
-.uneditable-input[class*="span"],
-.row-fluid input[class*="span"],
-.row-fluid select[class*="span"],
-.row-fluid textarea[class*="span"],
-.row-fluid .uneditable-input[class*="span"] {
-  float: none;
-  margin-left: 0;
+.glyphicon-envelope:before {
+  content: "\2709";
 }
 
-.input-append input[class*="span"],
-.input-append .uneditable-input[class*="span"],
-.input-prepend input[class*="span"],
-.input-prepend .uneditable-input[class*="span"],
-.row-fluid input[class*="span"],
-.row-fluid select[class*="span"],
-.row-fluid textarea[class*="span"],
-.row-fluid .uneditable-input[class*="span"],
-.row-fluid .input-prepend [class*="span"],
-.row-fluid .input-append [class*="span"] {
-  display: inline-block;
+.glyphicon-pencil:before {
+  content: "\270f";
 }
 
-input,
-textarea,
-.uneditable-input {
-  margin-left: 0;
+.glyphicon-glass:before {
+  content: "\e001";
 }
 
-.controls-row [class*="span"] + [class*="span"] {
-  margin-left: 20px;
+.glyphicon-music:before {
+  content: "\e002";
 }
 
-input.span12,
-textarea.span12,
-.uneditable-input.span12 {
-  width: 926px;
+.glyphicon-search:before {
+  content: "\e003";
 }
 
-input.span11,
-textarea.span11,
-.uneditable-input.span11 {
-  width: 846px;
+.glyphicon-heart:before {
+  content: "\e005";
 }
 
-input.span10,
-textarea.span10,
-.uneditable-input.span10 {
-  width: 766px;
+.glyphicon-star:before {
+  content: "\e006";
 }
 
-input.span9,
-textarea.span9,
-.uneditable-input.span9 {
-  width: 686px;
+.glyphicon-star-empty:before {
+  content: "\e007";
 }
 
-input.span8,
-textarea.span8,
-.uneditable-input.span8 {
-  width: 606px;
+.glyphicon-user:before {
+  content: "\e008";
 }
 
-input.span7,
-textarea.span7,
-.uneditable-input.span7 {
-  width: 526px;
+.glyphicon-film:before {
+  content: "\e009";
 }
 
-input.span6,
-textarea.span6,
-.uneditable-input.span6 {
-  width: 446px;
+.glyphicon-th-large:before {
+  content: "\e010";
 }
 
-input.span5,
-textarea.span5,
-.uneditable-input.span5 {
-  width: 366px;
+.glyphicon-th:before {
+  content: "\e011";
 }
 
-input.span4,
-textarea.span4,
-.uneditable-input.span4 {
-  width: 286px;
+.glyphicon-th-list:before {
+  content: "\e012";
 }
 
-input.span3,
-textarea.span3,
-.uneditable-input.span3 {
-  width: 206px;
+.glyphicon-ok:before {
+  content: "\e013";
 }
 
-input.span2,
-textarea.span2,
-.uneditable-input.span2 {
-  width: 126px;
+.glyphicon-remove:before {
+  content: "\e014";
 }
 
-input.span1,
-textarea.span1,
-.uneditable-input.span1 {
-  width: 46px;
+.glyphicon-zoom-in:before {
+  content: "\e015";
 }
 
-.controls-row {
-  *zoom: 1;
+.glyphicon-zoom-out:before {
+  content: "\e016";
 }
 
-.controls-row:before,
-.controls-row:after {
-  display: table;
-  line-height: 0;
-  content: "";
+.glyphicon-off:before {
+  content: "\e017";
 }
 
-.controls-row:after {
-  clear: both;
+.glyphicon-signal:before {
+  content: "\e018";
 }
 
-.controls-row [class*="span"],
-.row-fluid .controls-row [class*="span"] {
-  float: left;
+.glyphicon-cog:before {
+  content: "\e019";
 }
 
-.controls-row .checkbox[class*="span"],
-.controls-row .radio[class*="span"] {
-  padding-top: 5px;
+.glyphicon-trash:before {
+  content: "\e020";
 }
 
-input[disabled],
-select[disabled],
-textarea[disabled],
-input[readonly],
-select[readonly],
-textarea[readonly] {
-  cursor: not-allowed;
-  background-color: #eeeeee;
+.glyphicon-home:before {
+  content: "\e021";
 }
 
-input[type="radio"][disabled],
-input[type="checkbox"][disabled],
-input[type="radio"][readonly],
-input[type="checkbox"][readonly] {
-  background-color: transparent;
+.glyphicon-file:before {
+  content: "\e022";
 }
 
-.control-group.warning .control-label,
-.control-group.warning .help-block,
-.control-group.warning .help-inline {
-  color: #c09853;
+.glyphicon-time:before {
+  content: "\e023";
 }
 
-.control-group.warning .checkbox,
-.control-group.warning .radio,
-.control-group.warning input,
-.control-group.warning select,
-.control-group.warning textarea {
-  color: #c09853;
+.glyphicon-road:before {
+  content: "\e024";
 }
 
-.control-group.warning input,
-.control-group.warning select,
-.control-group.warning textarea {
-  border-color: #c09853;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+.glyphicon-download-alt:before {
+  content: "\e025";
 }
 
-.control-group.warning input:focus,
-.control-group.warning select:focus,
-.control-group.warning textarea:focus {
-  border-color: #a47e3c;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+.glyphicon-download:before {
+  content: "\e026";
 }
 
-.control-group.warning .input-prepend .add-on,
-.control-group.warning .input-append .add-on {
-  color: #c09853;
-  background-color: #fcf8e3;
-  border-color: #c09853;
+.glyphicon-upload:before {
+  content: "\e027";
 }
 
-.control-group.error .control-label,
-.control-group.error .help-block,
-.control-group.error .help-inline {
-  color: #b94a48;
+.glyphicon-inbox:before {
+  content: "\e028";
 }
 
-.control-group.error .checkbox,
-.control-group.error .radio,
-.control-group.error input,
-.control-group.error select,
-.control-group.error textarea {
-  color: #b94a48;
+.glyphicon-play-circle:before {
+  content: "\e029";
 }
 
-.control-group.error input,
-.control-group.error select,
-.control-group.error textarea {
-  border-color: #b94a48;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+.glyphicon-repeat:before {
+  content: "\e030";
 }
 
-.control-group.error input:focus,
-.control-group.error select:focus,
-.control-group.error textarea:focus {
-  border-color: #953b39;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+.glyphicon-refresh:before {
+  content: "\e031";
 }
 
-.control-group.error .input-prepend .add-on,
-.control-group.error .input-append .add-on {
-  color: #b94a48;
-  background-color: #f2dede;
-  border-color: #b94a48;
+.glyphicon-list-alt:before {
+  content: "\e032";
 }
 
-.control-group.success .control-label,
-.control-group.success .help-block,
-.control-group.success .help-inline {
-  color: #468847;
+.glyphicon-lock:before {
+  content: "\e033";
 }
 
-.control-group.success .checkbox,
-.control-group.success .radio,
-.control-group.success input,
-.control-group.success select,
-.control-group.success textarea {
-  color: #468847;
+.glyphicon-flag:before {
+  content: "\e034";
 }
 
-.control-group.success input,
-.control-group.success select,
-.control-group.success textarea {
-  border-color: #468847;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+.glyphicon-headphones:before {
+  content: "\e035";
 }
 
-.control-group.success input:focus,
-.control-group.success select:focus,
-.control-group.success textarea:focus {
-  border-color: #356635;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+.glyphicon-volume-off:before {
+  content: "\e036";
 }
 
-.control-group.success .input-prepend .add-on,
-.control-group.success .input-append .add-on {
-  color: #468847;
-  background-color: #dff0d8;
-  border-color: #468847;
+.glyphicon-volume-down:before {
+  content: "\e037";
 }
 
-.control-group.info .control-label,
-.control-group.info .help-block,
-.control-group.info .help-inline {
-  color: #3a87ad;
+.glyphicon-volume-up:before {
+  content: "\e038";
 }
 
-.control-group.info .checkbox,
-.control-group.info .radio,
-.control-group.info input,
-.control-group.info select,
-.control-group.info textarea {
-  color: #3a87ad;
+.glyphicon-qrcode:before {
+  content: "\e039";
 }
 
-.control-group.info input,
-.control-group.info select,
-.control-group.info textarea {
-  border-color: #3a87ad;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+.glyphicon-barcode:before {
+  content: "\e040";
 }
 
-.control-group.info input:focus,
-.control-group.info select:focus,
-.control-group.info textarea:focus {
-  border-color: #2d6987;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
+.glyphicon-tag:before {
+  content: "\e041";
 }
 
-.control-group.info .input-prepend .add-on,
-.control-group.info .input-append .add-on {
-  color: #3a87ad;
-  background-color: #d9edf7;
-  border-color: #3a87ad;
+.glyphicon-tags:before {
+  content: "\e042";
 }
 
-input:focus:invalid,
-textarea:focus:invalid,
-select:focus:invalid {
-  color: #b94a48;
-  border-color: #ee5f5b;
+.glyphicon-book:before {
+  content: "\e043";
 }
 
-input:focus:invalid:focus,
-textarea:focus:invalid:focus,
-select:focus:invalid:focus {
-  border-color: #e9322d;
-  -webkit-box-shadow: 0 0 6px #f8b9b7;
-     -moz-box-shadow: 0 0 6px #f8b9b7;
-          box-shadow: 0 0 6px #f8b9b7;
+.glyphicon-bookmark:before {
+  content: "\e044";
 }
 
-.form-actions {
-  padding: 19px 20px 20px;
-  margin-top: 20px;
-  margin-bottom: 20px;
-  background-color: #f5f5f5;
-  border-top: 1px solid #e5e5e5;
-  *zoom: 1;
+.glyphicon-print:before {
+  content: "\e045";
 }
 
-.form-actions:before,
-.form-actions:after {
-  display: table;
-  line-height: 0;
-  content: "";
+.glyphicon-camera:before {
+  content: "\e046";
 }
 
-.form-actions:after {
-  clear: both;
+.glyphicon-font:before {
+  content: "\e047";
 }
 
-.help-block,
-.help-inline {
-  color: #595959;
+.glyphicon-bold:before {
+  content: "\e048";
 }
 
-.help-block {
-  display: block;
-  margin-bottom: 10px;
+.glyphicon-italic:before {
+  content: "\e049";
 }
 
-.help-inline {
-  display: inline-block;
-  *display: inline;
-  padding-left: 5px;
-  vertical-align: middle;
-  *zoom: 1;
+.glyphicon-text-height:before {
+  content: "\e050";
 }
 
-.input-append,
-.input-prepend {
-  display: inline-block;
-  margin-bottom: 10px;
-  font-size: 0;
-  white-space: nowrap;
-  vertical-align: middle;
+.glyphicon-text-width:before {
+  content: "\e051";
 }
 
-.input-append input,
-.input-prepend input,
-.input-append select,
-.input-prepend select,
-.input-append .uneditable-input,
-.input-prepend .uneditable-input,
-.input-append .dropdown-menu,
-.input-prepend .dropdown-menu,
-.input-append .popover,
-.input-prepend .popover {
-  font-size: 14px;
+.glyphicon-align-left:before {
+  content: "\e052";
 }
 
-.input-append input,
-.input-prepend input,
-.input-append select,
-.input-prepend select,
-.input-append .uneditable-input,
-.input-prepend .uneditable-input {
-  position: relative;
-  margin-bottom: 0;
-  *margin-left: 0;
-  vertical-align: top;
-  -webkit-border-radius: 0 4px 4px 0;
-     -moz-border-radius: 0 4px 4px 0;
-          border-radius: 0 4px 4px 0;
+.glyphicon-align-center:before {
+  content: "\e053";
 }
 
-.input-append input:focus,
-.input-prepend input:focus,
-.input-append select:focus,
-.input-prepend select:focus,
-.input-append .uneditable-input:focus,
-.input-prepend .uneditable-input:focus {
-  z-index: 2;
+.glyphicon-align-right:before {
+  content: "\e054";
 }
 
-.input-append .add-on,
-.input-prepend .add-on {
-  display: inline-block;
-  width: auto;
-  height: 20px;
-  min-width: 16px;
-  padding: 4px 5px;
-  font-size: 14px;
-  font-weight: normal;
-  line-height: 20px;
-  text-align: center;
-  text-shadow: 0 1px 0 #ffffff;
-  background-color: #eeeeee;
-  border: 1px solid #ccc;
+.glyphicon-align-justify:before {
+  content: "\e055";
 }
 
-.input-append .add-on,
-.input-prepend .add-on,
-.input-append .btn,
-.input-prepend .btn,
-.input-append .btn-group > .dropdown-toggle,
-.input-prepend .btn-group > .dropdown-toggle {
-  vertical-align: top;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
+.glyphicon-list:before {
+  content: "\e056";
 }
 
-.input-append .active,
-.input-prepend .active {
-  background-color: #a9dba9;
-  border-color: #46a546;
+.glyphicon-indent-left:before {
+  content: "\e057";
 }
 
-.input-prepend .add-on,
-.input-prepend .btn {
-  margin-right: -1px;
+.glyphicon-indent-right:before {
+  content: "\e058";
 }
 
-.input-prepend .add-on:first-child,
-.input-prepend .btn:first-child {
-  -webkit-border-radius: 4px 0 0 4px;
-     -moz-border-radius: 4px 0 0 4px;
-          border-radius: 4px 0 0 4px;
+.glyphicon-facetime-video:before {
+  content: "\e059";
 }
 
-.input-append input,
-.input-append select,
-.input-append .uneditable-input {
-  -webkit-border-radius: 4px 0 0 4px;
-     -moz-border-radius: 4px 0 0 4px;
-          border-radius: 4px 0 0 4px;
+.glyphicon-picture:before {
+  content: "\e060";
 }
 
-.input-append input + .btn-group .btn:last-child,
-.input-append select + .btn-group .btn:last-child,
-.input-append .uneditable-input + .btn-group .btn:last-child {
-  -webkit-border-radius: 0 4px 4px 0;
-     -moz-border-radius: 0 4px 4px 0;
-          border-radius: 0 4px 4px 0;
+.glyphicon-map-marker:before {
+  content: "\e062";
 }
 
-.input-append .add-on,
-.input-append .btn,
-.input-append .btn-group {
-  margin-left: -1px;
+.glyphicon-adjust:before {
+  content: "\e063";
 }
 
-.input-append .add-on:last-child,
-.input-append .btn:last-child,
-.input-append .btn-group:last-child > .dropdown-toggle {
-  -webkit-border-radius: 0 4px 4px 0;
-     -moz-border-radius: 0 4px 4px 0;
-          border-radius: 0 4px 4px 0;
+.glyphicon-tint:before {
+  content: "\e064";
 }
 
-.input-prepend.input-append input,
-.input-prepend.input-append select,
-.input-prepend.input-append .uneditable-input {
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
+.glyphicon-edit:before {
+  content: "\e065";
 }
 
-.input-prepend.input-append input + .btn-group .btn,
-.input-prepend.input-append select + .btn-group .btn,
-.input-prepend.input-append .uneditable-input + .btn-group .btn {
-  -webkit-border-radius: 0 4px 4px 0;
-     -moz-border-radius: 0 4px 4px 0;
-          border-radius: 0 4px 4px 0;
+.glyphicon-share:before {
+  content: "\e066";
 }
 
-.input-prepend.input-append .add-on:first-child,
-.input-prepend.input-append .btn:first-child {
-  margin-right: -1px;
-  -webkit-border-radius: 4px 0 0 4px;
-     -moz-border-radius: 4px 0 0 4px;
-          border-radius: 4px 0 0 4px;
+.glyphicon-check:before {
+  content: "\e067";
 }
 
-.input-prepend.input-append .add-on:last-child,
-.input-prepend.input-append .btn:last-child {
-  margin-left: -1px;
-  -webkit-border-radius: 0 4px 4px 0;
-     -moz-border-radius: 0 4px 4px 0;
-          border-radius: 0 4px 4px 0;
+.glyphicon-move:before {
+  content: "\e068";
 }
 
-.input-prepend.input-append .btn-group:first-child {
-  margin-left: 0;
+.glyphicon-step-backward:before {
+  content: "\e069";
 }
 
-input.search-query {
-  padding-right: 14px;
-  padding-right: 4px \9;
-  padding-left: 14px;
-  padding-left: 4px \9;
-  /* IE7-8 doesn't have border-radius, so don't indent the padding */
+.glyphicon-fast-backward:before {
+  content: "\e070";
+}
 
-  margin-bottom: 0;
-  -webkit-border-radius: 15px;
-     -moz-border-radius: 15px;
-          border-radius: 15px;
-}
-
-/* Allow for input prepend/append in search forms */
-
-.form-search .input-append .search-query,
-.form-search .input-prepend .search-query {
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.form-search .input-append .search-query {
-  -webkit-border-radius: 14px 0 0 14px;
-     -moz-border-radius: 14px 0 0 14px;
-          border-radius: 14px 0 0 14px;
-}
-
-.form-search .input-append .btn {
-  -webkit-border-radius: 0 14px 14px 0;
-     -moz-border-radius: 0 14px 14px 0;
-          border-radius: 0 14px 14px 0;
-}
-
-.form-search .input-prepend .search-query {
-  -webkit-border-radius: 0 14px 14px 0;
-     -moz-border-radius: 0 14px 14px 0;
-          border-radius: 0 14px 14px 0;
-}
-
-.form-search .input-prepend .btn {
-  -webkit-border-radius: 14px 0 0 14px;
-     -moz-border-radius: 14px 0 0 14px;
-          border-radius: 14px 0 0 14px;
-}
-
-.form-search input,
-.form-inline input,
-.form-horizontal input,
-.form-search textarea,
-.form-inline textarea,
-.form-horizontal textarea,
-.form-search select,
-.form-inline select,
-.form-horizontal select,
-.form-search .help-inline,
-.form-inline .help-inline,
-.form-horizontal .help-inline,
-.form-search .uneditable-input,
-.form-inline .uneditable-input,
-.form-horizontal .uneditable-input,
-.form-search .input-prepend,
-.form-inline .input-prepend,
-.form-horizontal .input-prepend,
-.form-search .input-append,
-.form-inline .input-append,
-.form-horizontal .input-append {
-  display: inline-block;
-  *display: inline;
-  margin-bottom: 0;
-  vertical-align: middle;
-  *zoom: 1;
+.glyphicon-backward:before {
+  content: "\e071";
 }
 
-.form-search .hide,
-.form-inline .hide,
-.form-horizontal .hide {
-  display: none;
+.glyphicon-play:before {
+  content: "\e072";
 }
 
-.form-search label,
-.form-inline label,
-.form-search .btn-group,
-.form-inline .btn-group {
-  display: inline-block;
+.glyphicon-pause:before {
+  content: "\e073";
 }
 
-.form-search .input-append,
-.form-inline .input-append,
-.form-search .input-prepend,
-.form-inline .input-prepend {
-  margin-bottom: 0;
+.glyphicon-stop:before {
+  content: "\e074";
 }
 
-.form-search .radio,
-.form-search .checkbox,
-.form-inline .radio,
-.form-inline .checkbox {
-  padding-left: 0;
-  margin-bottom: 0;
-  vertical-align: middle;
+.glyphicon-forward:before {
+  content: "\e075";
 }
 
-.form-search .radio input[type="radio"],
-.form-search .checkbox input[type="checkbox"],
-.form-inline .radio input[type="radio"],
-.form-inline .checkbox input[type="checkbox"] {
-  float: left;
-  margin-right: 3px;
-  margin-left: 0;
+.glyphicon-fast-forward:before {
+  content: "\e076";
 }
 
-.control-group {
-  margin-bottom: 10px;
+.glyphicon-step-forward:before {
+  content: "\e077";
 }
 
-legend + .control-group {
-  margin-top: 20px;
-  -webkit-margin-top-collapse: separate;
+.glyphicon-eject:before {
+  content: "\e078";
 }
 
-.form-horizontal .control-group {
-  margin-bottom: 20px;
-  *zoom: 1;
+.glyphicon-chevron-left:before {
+  content: "\e079";
 }
 
-.form-horizontal .control-group:before,
-.form-horizontal .control-group:after {
-  display: table;
-  line-height: 0;
-  content: "";
+.glyphicon-chevron-right:before {
+  content: "\e080";
 }
 
-.form-horizontal .control-group:after {
-  clear: both;
+.glyphicon-plus-sign:before {
+  content: "\e081";
 }
 
-.form-horizontal .control-label {
-  float: left;
-  width: 160px;
-  padding-top: 5px;
-  text-align: right;
+.glyphicon-minus-sign:before {
+  content: "\e082";
 }
 
-.form-horizontal .controls {
-  *display: inline-block;
-  *padding-left: 20px;
-  margin-left: 180px;
-  *margin-left: 0;
+.glyphicon-remove-sign:before {
+  content: "\e083";
 }
 
-.form-horizontal .controls:first-child {
-  *padding-left: 180px;
+.glyphicon-ok-sign:before {
+  content: "\e084";
 }
 
-.form-horizontal .help-block {
-  margin-bottom: 0;
+.glyphicon-question-sign:before {
+  content: "\e085";
 }
 
-.form-horizontal input + .help-block,
-.form-horizontal select + .help-block,
-.form-horizontal textarea + .help-block,
-.form-horizontal .uneditable-input + .help-block,
-.form-horizontal .input-prepend + .help-block,
-.form-horizontal .input-append + .help-block {
-  margin-top: 10px;
+.glyphicon-info-sign:before {
+  content: "\e086";
 }
 
-.form-horizontal .form-actions {
-  padding-left: 180px;
+.glyphicon-screenshot:before {
+  content: "\e087";
 }
 
-table {
-  max-width: 100%;
-  background-color: transparent;
-  border-collapse: collapse;
-  border-spacing: 0;
+.glyphicon-remove-circle:before {
+  content: "\e088";
 }
 
-.table {
-  width: 100%;
-  margin-bottom: 20px;
+.glyphicon-ok-circle:before {
+  content: "\e089";
 }
 
-.table th,
-.table td {
-  padding: 8px;
-  line-height: 20px;
-  text-align: left;
-  vertical-align: top;
-  border-top: 1px solid #dddddd;
+.glyphicon-ban-circle:before {
+  content: "\e090";
 }
 
-.table th {
-  font-weight: bold;
+.glyphicon-arrow-left:before {
+  content: "\e091";
 }
 
-.table thead th {
-  vertical-align: bottom;
+.glyphicon-arrow-right:before {
+  content: "\e092";
 }
 
-.table caption + thead tr:first-child th,
-.table caption + thead tr:first-child td,
-.table colgroup + thead tr:first-child th,
-.table colgroup + thead tr:first-child td,
-.table thead:first-child tr:first-child th,
-.table thead:first-child tr:first-child td {
-  border-top: 0;
+.glyphicon-arrow-up:before {
+  content: "\e093";
 }
 
-.table tbody + tbody {
-  border-top: 2px solid #dddddd;
+.glyphicon-arrow-down:before {
+  content: "\e094";
 }
 
-.table .table {
-  background-color: #ffffff;
+.glyphicon-share-alt:before {
+  content: "\e095";
 }
 
-.table-condensed th,
-.table-condensed td {
-  padding: 4px 5px;
+.glyphicon-resize-full:before {
+  content: "\e096";
 }
 
-.table-bordered {
-  border: 1px solid #dddddd;
-  border-collapse: separate;
-  *border-collapse: collapse;
-  border-left: 0;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
+.glyphicon-resize-small:before {
+  content: "\e097";
 }
 
-.table-bordered th,
-.table-bordered td {
-  border-left: 1px solid #dddddd;
+.glyphicon-exclamation-sign:before {
+  content: "\e101";
 }
 
-.table-bordered caption + thead tr:first-child th,
-.table-bordered caption + tbody tr:first-child th,
-.table-bordered caption + tbody tr:first-child td,
-.table-bordered colgroup + thead tr:first-child th,
-.table-bordered colgroup + tbody tr:first-child th,
-.table-bordered colgroup + tbody tr:first-child td,
-.table-bordered thead:first-child tr:first-child th,
-.table-bordered tbody:first-child tr:first-child th,
-.table-bordered tbody:first-child tr:first-child td {
-  border-top: 0;
+.glyphicon-gift:before {
+  content: "\e102";
 }
 
-.table-bordered thead:first-child tr:first-child > th:first-child,
-.table-bordered tbody:first-child tr:first-child > td:first-child,
-.table-bordered tbody:first-child tr:first-child > th:first-child {
-  -webkit-border-top-left-radius: 4px;
-          border-top-left-radius: 4px;
-  -moz-border-radius-topleft: 4px;
+.glyphicon-leaf:before {
+  content: "\e103";
 }
 
-.table-bordered thead:first-child tr:first-child > th:last-child,
-.table-bordered tbody:first-child tr:first-child > td:last-child,
-.table-bordered tbody:first-child tr:first-child > th:last-child {
-  -webkit-border-top-right-radius: 4px;
-          border-top-right-radius: 4px;
-  -moz-border-radius-topright: 4px;
+.glyphicon-fire:before {
+  content: "\e104";
 }
 
-.table-bordered thead:last-child tr:last-child > th:first-child,
-.table-bordered tbody:last-child tr:last-child > td:first-child,
-.table-bordered tbody:last-child tr:last-child > th:first-child,
-.table-bordered tfoot:last-child tr:last-child > td:first-child,
-.table-bordered tfoot:last-child tr:last-child > th:first-child {
-  -webkit-border-bottom-left-radius: 4px;
-          border-bottom-left-radius: 4px;
-  -moz-border-radius-bottomleft: 4px;
+.glyphicon-eye-open:before {
+  content: "\e105";
 }
 
-.table-bordered thead:last-child tr:last-child > th:last-child,
-.table-bordered tbody:last-child tr:last-child > td:last-child,
-.table-bordered tbody:last-child tr:last-child > th:last-child,
-.table-bordered tfoot:last-child tr:last-child > td:last-child,
-.table-bordered tfoot:last-child tr:last-child > th:last-child {
-  -webkit-border-bottom-right-radius: 4px;
-          border-bottom-right-radius: 4px;
-  -moz-border-radius-bottomright: 4px;
+.glyphicon-eye-close:before {
+  content: "\e106";
 }
 
-.table-bordered tfoot + tbody:last-child tr:last-child td:first-child {
-  -webkit-border-bottom-left-radius: 0;
-          border-bottom-left-radius: 0;
-  -moz-border-radius-bottomleft: 0;
+.glyphicon-warning-sign:before {
+  content: "\e107";
 }
 
-.table-bordered tfoot + tbody:last-child tr:last-child td:last-child {
-  -webkit-border-bottom-right-radius: 0;
-          border-bottom-right-radius: 0;
-  -moz-border-radius-bottomright: 0;
+.glyphicon-plane:before {
+  content: "\e108";
 }
 
-.table-bordered caption + thead tr:first-child th:first-child,
-.table-bordered caption + tbody tr:first-child td:first-child,
-.table-bordered colgroup + thead tr:first-child th:first-child,
-.table-bordered colgroup + tbody tr:first-child td:first-child {
-  -webkit-border-top-left-radius: 4px;
-          border-top-left-radius: 4px;
-  -moz-border-radius-topleft: 4px;
+.glyphicon-calendar:before {
+  content: "\e109";
 }
 
-.table-bordered caption + thead tr:first-child th:last-child,
-.table-bordered caption + tbody tr:first-child td:last-child,
-.table-bordered colgroup + thead tr:first-child th:last-child,
-.table-bordered colgroup + tbody tr:first-child td:last-child {
-  -webkit-border-top-right-radius: 4px;
-          border-top-right-radius: 4px;
-  -moz-border-radius-topright: 4px;
+.glyphicon-random:before {
+  content: "\e110";
 }
 
-.table-striped tbody > tr:nth-child(odd) > td,
-.table-striped tbody > tr:nth-child(odd) > th {
-  background-color: #f9f9f9;
+.glyphicon-comment:before {
+  content: "\e111";
 }
 
-.table-hover tbody tr:hover > td,
-.table-hover tbody tr:hover > th {
-  background-color: #f5f5f5;
+.glyphicon-magnet:before {
+  content: "\e112";
 }
 
-table td[class*="span"],
-table th[class*="span"],
-.row-fluid table td[class*="span"],
-.row-fluid table th[class*="span"] {
-  display: table-cell;
-  float: none;
-  margin-left: 0;
+.glyphicon-chevron-up:before {
+  content: "\e113";
 }
 
-.table td.span1,
-.table th.span1 {
-  float: none;
-  width: 44px;
-  margin-left: 0;
+.glyphicon-chevron-down:before {
+  content: "\e114";
 }
 
-.table td.span2,
-.table th.span2 {
-  float: none;
-  width: 124px;
-  margin-left: 0;
+.glyphicon-retweet:before {
+  content: "\e115";
 }
 
-.table td.span3,
-.table th.span3 {
-  float: none;
-  width: 204px;
-  margin-left: 0;
+.glyphicon-shopping-cart:before {
+  content: "\e116";
 }
 
-.table td.span4,
-.table th.span4 {
-  float: none;
-  width: 284px;
-  margin-left: 0;
+.glyphicon-folder-close:before {
+  content: "\e117";
 }
 
-.table td.span5,
-.table th.span5 {
-  float: none;
-  width: 364px;
-  margin-left: 0;
+.glyphicon-folder-open:before {
+  content: "\e118";
 }
 
-.table td.span6,
-.table th.span6 {
-  float: none;
-  width: 444px;
-  margin-left: 0;
+.glyphicon-resize-vertical:before {
+  content: "\e119";
 }
 
-.table td.span7,
-.table th.span7 {
-  float: none;
-  width: 524px;
-  margin-left: 0;
+.glyphicon-resize-horizontal:before {
+  content: "\e120";
 }
 
-.table td.span8,
-.table th.span8 {
-  float: none;
-  width: 604px;
-  margin-left: 0;
+.glyphicon-hdd:before {
+  content: "\e121";
 }
 
-.table td.span9,
-.table th.span9 {
-  float: none;
-  width: 684px;
-  margin-left: 0;
+.glyphicon-bullhorn:before {
+  content: "\e122";
 }
 
-.table td.span10,
-.table th.span10 {
-  float: none;
-  width: 764px;
-  margin-left: 0;
+.glyphicon-bell:before {
+  content: "\e123";
 }
 
-.table td.span11,
-.table th.span11 {
-  float: none;
-  width: 844px;
-  margin-left: 0;
+.glyphicon-certificate:before {
+  content: "\e124";
 }
 
-.table td.span12,
-.table th.span12 {
-  float: none;
-  width: 924px;
-  margin-left: 0;
+.glyphicon-thumbs-up:before {
+  content: "\e125";
 }
 
-.table tbody tr.success > td {
-  background-color: #dff0d8;
+.glyphicon-thumbs-down:before {
+  content: "\e126";
 }
 
-.table tbody tr.error > td {
-  background-color: #f2dede;
+.glyphicon-hand-right:before {
+  content: "\e127";
 }
 
-.table tbody tr.warning > td {
-  background-color: #fcf8e3;
+.glyphicon-hand-left:before {
+  content: "\e128";
 }
 
-.table tbody tr.info > td {
-  background-color: #d9edf7;
+.glyphicon-hand-up:before {
+  content: "\e129";
 }
 
-.table-hover tbody tr.success:hover > td {
-  background-color: #d0e9c6;
+.glyphicon-hand-down:before {
+  content: "\e130";
 }
 
-.table-hover tbody tr.error:hover > td {
-  background-color: #ebcccc;
+.glyphicon-circle-arrow-right:before {
+  content: "\e131";
 }
 
-.table-hover tbody tr.warning:hover > td {
-  background-color: #faf2cc;
+.glyphicon-circle-arrow-left:before {
+  content: "\e132";
 }
 
-.table-hover tbody tr.info:hover > td {
-  background-color: #c4e3f3;
+.glyphicon-circle-arrow-up:before {
+  content: "\e133";
 }
 
-[class^="icon-"],
-[class*=" icon-"] {
-  display: inline-block;
-  width: 14px;
-  height: 14px;
-  margin-top: 1px;
-  *margin-right: .3em;
-  line-height: 14px;
-  vertical-align: text-top;
-  background-image: url("../img/glyphicons-halflings.png");
-  background-position: 14px 14px;
-  background-repeat: no-repeat;
+.glyphicon-circle-arrow-down:before {
+  content: "\e134";
 }
 
-/* White icons with optional class, or on hover/focus/active states of certain elements */
+.glyphicon-globe:before {
+  content: "\e135";
+}
 
-.icon-white,
-.nav-pills > .active > a > [class^="icon-"],
-.nav-pills > .active > a > [class*=" icon-"],
-.nav-list > .active > a > [class^="icon-"],
-.nav-list > .active > a > [class*=" icon-"],
-.navbar-inverse .nav > .active > a > [class^="icon-"],
-.navbar-inverse .nav > .active > a > [class*=" icon-"],
-.dropdown-menu > li > a:hover > [class^="icon-"],
-.dropdown-menu > li > a:focus > [class^="icon-"],
-.dropdown-menu > li > a:hover > [class*=" icon-"],
-.dropdown-menu > li > a:focus > [class*=" icon-"],
-.dropdown-menu > .active > a > [class^="icon-"],
-.dropdown-menu > .active > a > [class*=" icon-"],
-.dropdown-submenu:hover > a > [class^="icon-"],
-.dropdown-submenu:focus > a > [class^="icon-"],
-.dropdown-submenu:hover > a > [class*=" icon-"],
-.dropdown-submenu:focus > a > [class*=" icon-"] {
-  background-image: url("../img/glyphicons-halflings-white.png");
+.glyphicon-wrench:before {
+  content: "\e136";
 }
 
-.icon-glass {
-  background-position: 0      0;
+.glyphicon-tasks:before {
+  content: "\e137";
 }
 
-.icon-music {
-  background-position: -24px 0;
+.glyphicon-filter:before {
+  content: "\e138";
 }
 
-.icon-search {
-  background-position: -48px 0;
+.glyphicon-briefcase:before {
+  content: "\e139";
 }
 
-.icon-envelope {
-  background-position: -72px 0;
+.glyphicon-fullscreen:before {
+  content: "\e140";
 }
 
-.icon-heart {
-  background-position: -96px 0;
+.glyphicon-dashboard:before {
+  content: "\e141";
 }
 
-.icon-star {
-  background-position: -120px 0;
+.glyphicon-paperclip:before {
+  content: "\e142";
 }
 
-.icon-star-empty {
-  background-position: -144px 0;
+.glyphicon-heart-empty:before {
+  content: "\e143";
 }
 
-.icon-user {
-  background-position: -168px 0;
+.glyphicon-link:before {
+  content: "\e144";
 }
 
-.icon-film {
-  background-position: -192px 0;
+.glyphicon-phone:before {
+  content: "\e145";
 }
 
-.icon-th-large {
-  background-position: -216px 0;
+.glyphicon-pushpin:before {
+  content: "\e146";
 }
 
-.icon-th {
-  background-position: -240px 0;
+.glyphicon-usd:before {
+  content: "\e148";
 }
 
-.icon-th-list {
-  background-position: -264px 0;
+.glyphicon-gbp:before {
+  content: "\e149";
 }
 
-.icon-ok {
-  background-position: -288px 0;
+.glyphicon-sort:before {
+  content: "\e150";
 }
 
-.icon-remove {
-  background-position: -312px 0;
+.glyphicon-sort-by-alphabet:before {
+  content: "\e151";
 }
 
-.icon-zoom-in {
-  background-position: -336px 0;
+.glyphicon-sort-by-alphabet-alt:before {
+  content: "\e152";
 }
 
-.icon-zoom-out {
-  background-position: -360px 0;
+.glyphicon-sort-by-order:before {
+  content: "\e153";
 }
 
-.icon-off {
-  background-position: -384px 0;
+.glyphicon-sort-by-order-alt:before {
+  content: "\e154";
 }
 
-.icon-signal {
-  background-position: -408px 0;
+.glyphicon-sort-by-attributes:before {
+  content: "\e155";
 }
 
-.icon-cog {
-  background-position: -432px 0;
+.glyphicon-sort-by-attributes-alt:before {
+  content: "\e156";
 }
 
-.icon-trash {
-  background-position: -456px 0;
+.glyphicon-unchecked:before {
+  content: "\e157";
 }
 
-.icon-home {
-  background-position: 0 -24px;
+.glyphicon-expand:before {
+  content: "\e158";
 }
 
-.icon-file {
-  background-position: -24px -24px;
+.glyphicon-collapse-down:before {
+  content: "\e159";
 }
 
-.icon-time {
-  background-position: -48px -24px;
+.glyphicon-collapse-up:before {
+  content: "\e160";
 }
 
-.icon-road {
-  background-position: -72px -24px;
+.glyphicon-log-in:before {
+  content: "\e161";
 }
 
-.icon-download-alt {
-  background-position: -96px -24px;
+.glyphicon-flash:before {
+  content: "\e162";
 }
 
-.icon-download {
-  background-position: -120px -24px;
+.glyphicon-log-out:before {
+  content: "\e163";
 }
 
-.icon-upload {
-  background-position: -144px -24px;
+.glyphicon-new-window:before {
+  content: "\e164";
 }
 
-.icon-inbox {
-  background-position: -168px -24px;
+.glyphicon-record:before {
+  content: "\e165";
 }
 
-.icon-play-circle {
-  background-position: -192px -24px;
+.glyphicon-save:before {
+  content: "\e166";
 }
 
-.icon-repeat {
-  background-position: -216px -24px;
+.glyphicon-open:before {
+  content: "\e167";
 }
 
-.icon-refresh {
-  background-position: -240px -24px;
+.glyphicon-saved:before {
+  content: "\e168";
 }
 
-.icon-list-alt {
-  background-position: -264px -24px;
+.glyphicon-import:before {
+  content: "\e169";
 }
 
-.icon-lock {
-  background-position: -287px -24px;
+.glyphicon-export:before {
+  content: "\e170";
 }
 
-.icon-flag {
-  background-position: -312px -24px;
+.glyphicon-send:before {
+  content: "\e171";
 }
 
-.icon-headphones {
-  background-position: -336px -24px;
+.glyphicon-floppy-disk:before {
+  content: "\e172";
 }
 
-.icon-volume-off {
-  background-position: -360px -24px;
+.glyphicon-floppy-saved:before {
+  content: "\e173";
 }
 
-.icon-volume-down {
-  background-position: -384px -24px;
+.glyphicon-floppy-remove:before {
+  content: "\e174";
 }
 
-.icon-volume-up {
-  background-position: -408px -24px;
+.glyphicon-floppy-save:before {
+  content: "\e175";
 }
 
-.icon-qrcode {
-  background-position: -432px -24px;
+.glyphicon-floppy-open:before {
+  content: "\e176";
 }
 
-.icon-barcode {
-  background-position: -456px -24px;
+.glyphicon-credit-card:before {
+  content: "\e177";
 }
 
-.icon-tag {
-  background-position: 0 -48px;
+.glyphicon-transfer:before {
+  content: "\e178";
 }
 
-.icon-tags {
-  background-position: -25px -48px;
+.glyphicon-cutlery:before {
+  content: "\e179";
 }
 
-.icon-book {
-  background-position: -48px -48px;
+.glyphicon-header:before {
+  content: "\e180";
 }
 
-.icon-bookmark {
-  background-position: -72px -48px;
+.glyphicon-compressed:before {
+  content: "\e181";
 }
 
-.icon-print {
-  background-position: -96px -48px;
+.glyphicon-earphone:before {
+  content: "\e182";
 }
 
-.icon-camera {
-  background-position: -120px -48px;
+.glyphicon-phone-alt:before {
+  content: "\e183";
 }
 
-.icon-font {
-  background-position: -144px -48px;
+.glyphicon-tower:before {
+  content: "\e184";
 }
 
-.icon-bold {
-  background-position: -167px -48px;
+.glyphicon-stats:before {
+  content: "\e185";
 }
 
-.icon-italic {
-  background-position: -192px -48px;
+.glyphicon-sd-video:before {
+  content: "\e186";
 }
 
-.icon-text-height {
-  background-position: -216px -48px;
+.glyphicon-hd-video:before {
+  content: "\e187";
 }
 
-.icon-text-width {
-  background-position: -240px -48px;
+.glyphicon-subtitles:before {
+  content: "\e188";
 }
 
-.icon-align-left {
-  background-position: -264px -48px;
+.glyphicon-sound-stereo:before {
+  content: "\e189";
 }
 
-.icon-align-center {
-  background-position: -288px -48px;
+.glyphicon-sound-dolby:before {
+  content: "\e190";
 }
 
-.icon-align-right {
-  background-position: -312px -48px;
+.glyphicon-sound-5-1:before {
+  content: "\e191";
 }
 
-.icon-align-justify {
-  background-position: -336px -48px;
+.glyphicon-sound-6-1:before {
+  content: "\e192";
 }
 
-.icon-list {
-  background-position: -360px -48px;
+.glyphicon-sound-7-1:before {
+  content: "\e193";
 }
 
-.icon-indent-left {
-  background-position: -384px -48px;
+.glyphicon-copyright-mark:before {
+  content: "\e194";
 }
 
-.icon-indent-right {
-  background-position: -408px -48px;
+.glyphicon-registration-mark:before {
+  content: "\e195";
 }
 
-.icon-facetime-video {
-  background-position: -432px -48px;
+.glyphicon-cloud-download:before {
+  content: "\e197";
 }
 
-.icon-picture {
-  background-position: -456px -48px;
+.glyphicon-cloud-upload:before {
+  content: "\e198";
 }
 
-.icon-pencil {
-  background-position: 0 -72px;
+.glyphicon-tree-conifer:before {
+  content: "\e199";
 }
 
-.icon-map-marker {
-  background-position: -24px -72px;
+.glyphicon-tree-deciduous:before {
+  content: "\e200";
 }
 
-.icon-adjust {
-  background-position: -48px -72px;
+.caret {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  margin-left: 2px;
+  vertical-align: middle;
+  border-top: 4px solid;
+  border-right: 4px solid transparent;
+  border-left: 4px solid transparent;
 }
 
-.icon-tint {
-  background-position: -72px -72px;
+.dropdown {
+  position: relative;
 }
 
-.icon-edit {
-  background-position: -96px -72px;
+.dropdown-toggle:focus {
+  outline: 0;
 }
 
-.icon-share {
-  background-position: -120px -72px;
+.dropdown-menu {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  z-index: 1000;
+  display: none;
+  float: left;
+  min-width: 160px;
+  padding: 5px 0;
+  margin: 2px 0 0;
+  font-size: 14px;
+  list-style: none;
+  background-color: #ffffff;
+  border: 1px solid #cccccc;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 4px;
+  -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+          box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+  background-clip: padding-box;
 }
 
-.icon-check {
-  background-position: -144px -72px;
+.dropdown-menu.pull-right {
+  right: 0;
+  left: auto;
 }
 
-.icon-move {
-  background-position: -168px -72px;
+.dropdown-menu .divider {
+  height: 1px;
+  margin: 9px 0;
+  overflow: hidden;
+  background-color: #e5e5e5;
 }
 
-.icon-step-backward {
-  background-position: -192px -72px;
+.dropdown-menu > li > a {
+  display: block;
+  padding: 3px 20px;
+  clear: both;
+  font-weight: normal;
+  line-height: 1.428571429;
+  color: #333333;
+  white-space: nowrap;
 }
 
-.icon-fast-backward {
-  background-position: -216px -72px;
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus {
+  color: #262626;
+  text-decoration: none;
+  background-color: #f5f5f5;
 }
 
-.icon-backward {
-  background-position: -240px -72px;
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #428bca;
+  outline: 0;
 }
 
-.icon-play {
-  background-position: -264px -72px;
+.dropdown-menu > .disabled > a,
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  color: #999999;
 }
 
-.icon-pause {
-  background-position: -288px -72px;
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  text-decoration: none;
+  cursor: not-allowed;
+  background-color: transparent;
+  background-image: none;
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
 }
 
-.icon-stop {
-  background-position: -312px -72px;
+.open > .dropdown-menu {
+  display: block;
 }
 
-.icon-forward {
-  background-position: -336px -72px;
+.open > a {
+  outline: 0;
 }
 
-.icon-fast-forward {
-  background-position: -360px -72px;
+.dropdown-header {
+  display: block;
+  padding: 3px 20px;
+  font-size: 12px;
+  line-height: 1.428571429;
+  color: #999999;
 }
 
-.icon-step-forward {
-  background-position: -384px -72px;
+.dropdown-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 990;
 }
 
-.icon-eject {
-  background-position: -408px -72px;
+.pull-right > .dropdown-menu {
+  right: 0;
+  left: auto;
 }
 
-.icon-chevron-left {
-  background-position: -432px -72px;
+.dropup .caret,
+.navbar-fixed-bottom .dropdown .caret {
+  border-top: 0;
+  border-bottom: 4px solid;
+  content: "";
 }
 
-.icon-chevron-right {
-  background-position: -456px -72px;
+.dropup .dropdown-menu,
+.navbar-fixed-bottom .dropdown .dropdown-menu {
+  top: auto;
+  bottom: 100%;
+  margin-bottom: 1px;
 }
 
-.icon-plus-sign {
-  background-position: 0 -96px;
+@media (min-width: 768px) {
+  .navbar-right .dropdown-menu {
+    right: 0;
+    left: auto;
+  }
 }
 
-.icon-minus-sign {
-  background-position: -24px -96px;
+.btn-group,
+.btn-group-vertical {
+  position: relative;
+  display: inline-block;
+  vertical-align: middle;
 }
 
-.icon-remove-sign {
-  background-position: -48px -96px;
+.btn-group > .btn,
+.btn-group-vertical > .btn {
+  position: relative;
+  float: left;
 }
 
-.icon-ok-sign {
-  background-position: -72px -96px;
+.btn-group > .btn:hover,
+.btn-group-vertical > .btn:hover,
+.btn-group > .btn:focus,
+.btn-group-vertical > .btn:focus,
+.btn-group > .btn:active,
+.btn-group-vertical > .btn:active,
+.btn-group > .btn.active,
+.btn-group-vertical > .btn.active {
+  z-index: 2;
 }
 
-.icon-question-sign {
-  background-position: -96px -96px;
+.btn-group > .btn:focus,
+.btn-group-vertical > .btn:focus {
+  outline: none;
 }
 
-.icon-info-sign {
-  background-position: -120px -96px;
+.btn-group .btn + .btn,
+.btn-group .btn + .btn-group,
+.btn-group .btn-group + .btn,
+.btn-group .btn-group + .btn-group {
+  margin-left: -1px;
 }
 
-.icon-screenshot {
-  background-position: -144px -96px;
+.btn-toolbar:before,
+.btn-toolbar:after {
+  display: table;
+  content: " ";
 }
 
-.icon-remove-circle {
-  background-position: -168px -96px;
+.btn-toolbar:after {
+  clear: both;
 }
 
-.icon-ok-circle {
-  background-position: -192px -96px;
+.btn-toolbar:before,
+.btn-toolbar:after {
+  display: table;
+  content: " ";
 }
 
-.icon-ban-circle {
-  background-position: -216px -96px;
+.btn-toolbar:after {
+  clear: both;
 }
 
-.icon-arrow-left {
-  background-position: -240px -96px;
+.btn-toolbar .btn-group {
+  float: left;
 }
 
-.icon-arrow-right {
-  background-position: -264px -96px;
+.btn-toolbar > .btn + .btn,
+.btn-toolbar > .btn-group + .btn,
+.btn-toolbar > .btn + .btn-group,
+.btn-toolbar > .btn-group + .btn-group {
+  margin-left: 5px;
 }
 
-.icon-arrow-up {
-  background-position: -289px -96px;
+.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
+  border-radius: 0;
 }
 
-.icon-arrow-down {
-  background-position: -312px -96px;
+.btn-group > .btn:first-child {
+  margin-left: 0;
 }
 
-.icon-share-alt {
-  background-position: -336px -96px;
+.btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
 }
 
-.icon-resize-full {
-  background-position: -360px -96px;
+.btn-group > .btn:last-child:not(:first-child),
+.btn-group > .dropdown-toggle:not(:first-child) {
+  border-bottom-left-radius: 0;
+  border-top-left-radius: 0;
 }
 
-.icon-resize-small {
-  background-position: -384px -96px;
+.btn-group > .btn-group {
+  float: left;
 }
 
-.icon-plus {
-  background-position: -408px -96px;
+.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
+  border-radius: 0;
 }
 
-.icon-minus {
-  background-position: -433px -96px;
+.btn-group > .btn-group:first-child > .btn:last-child,
+.btn-group > .btn-group:first-child > .dropdown-toggle {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
 }
 
-.icon-asterisk {
-  background-position: -456px -96px;
+.btn-group > .btn-group:last-child > .btn:first-child {
+  border-bottom-left-radius: 0;
+  border-top-left-radius: 0;
 }
 
-.icon-exclamation-sign {
-  background-position: 0 -120px;
+.btn-group .dropdown-toggle:active,
+.btn-group.open .dropdown-toggle {
+  outline: 0;
 }
 
-.icon-gift {
-  background-position: -24px -120px;
+.btn-group-xs > .btn {
+  padding: 1px 5px;
+  font-size: 12px;
+  line-height: 1.5;
+  border-radius: 3px;
 }
 
-.icon-leaf {
-  background-position: -48px -120px;
+.btn-group-sm > .btn {
+  padding: 5px 10px;
+  font-size: 12px;
+  line-height: 1.5;
+  border-radius: 3px;
 }
 
-.icon-fire {
-  background-position: -72px -120px;
+.btn-group-lg > .btn {
+  padding: 10px 16px;
+  font-size: 18px;
+  line-height: 1.33;
+  border-radius: 6px;
 }
 
-.icon-eye-open {
-  background-position: -96px -120px;
+.btn-group > .btn + .dropdown-toggle {
+  padding-right: 8px;
+  padding-left: 8px;
 }
 
-.icon-eye-close {
-  background-position: -120px -120px;
+.btn-group > .btn-lg + .dropdown-toggle {
+  padding-right: 12px;
+  padding-left: 12px;
 }
 
-.icon-warning-sign {
-  background-position: -144px -120px;
+.btn-group.open .dropdown-toggle {
+  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+          box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
 }
 
-.icon-plane {
-  background-position: -168px -120px;
+.btn-group.open .dropdown-toggle.btn-link {
+  -webkit-box-shadow: none;
+          box-shadow: none;
 }
 
-.icon-calendar {
-  background-position: -192px -120px;
+.btn .caret {
+  margin-left: 0;
 }
 
-.icon-random {
-  width: 16px;
-  background-position: -216px -120px;
+.btn-lg .caret {
+  border-width: 5px 5px 0;
+  border-bottom-width: 0;
 }
 
-.icon-comment {
-  background-position: -240px -120px;
+.dropup .btn-lg .caret {
+  border-width: 0 5px 5px;
 }
 
-.icon-magnet {
-  background-position: -264px -120px;
+.btn-group-vertical > .btn,
+.btn-group-vertical > .btn-group,
+.btn-group-vertical > .btn-group > .btn {
+  display: block;
+  float: none;
+  width: 100%;
+  max-width: 100%;
 }
 
-.icon-chevron-up {
-  background-position: -288px -120px;
+.btn-group-vertical > .btn-group:before,
+.btn-group-vertical > .btn-group:after {
+  display: table;
+  content: " ";
 }
 
-.icon-chevron-down {
-  background-position: -313px -119px;
+.btn-group-vertical > .btn-group:after {
+  clear: both;
 }
 
-.icon-retweet {
-  background-position: -336px -120px;
+.btn-group-vertical > .btn-group:before,
+.btn-group-vertical > .btn-group:after {
+  display: table;
+  content: " ";
 }
 
-.icon-shopping-cart {
-  background-position: -360px -120px;
+.btn-group-vertical > .btn-group:after {
+  clear: both;
 }
 
-.icon-folder-close {
-  width: 16px;
-  background-position: -384px -120px;
+.btn-group-vertical > .btn-group > .btn {
+  float: none;
 }
 
-.icon-folder-open {
-  width: 16px;
-  background-position: -408px -120px;
+.btn-group-vertical > .btn + .btn,
+.btn-group-vertical > .btn + .btn-group,
+.btn-group-vertical > .btn-group + .btn,
+.btn-group-vertical > .btn-group + .btn-group {
+  margin-top: -1px;
+  margin-left: 0;
 }
 
-.icon-resize-vertical {
-  background-position: -432px -119px;
+.btn-group-vertical > .btn:not(:first-child):not(:last-child) {
+  border-radius: 0;
 }
 
-.icon-resize-horizontal {
-  background-position: -456px -118px;
+.btn-group-vertical > .btn:first-child:not(:last-child) {
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
 }
 
-.icon-hdd {
-  background-position: 0 -144px;
+.btn-group-vertical > .btn:last-child:not(:first-child) {
+  border-top-right-radius: 0;
+  border-bottom-left-radius: 4px;
+  border-top-left-radius: 0;
 }
 
-.icon-bullhorn {
-  background-position: -24px -144px;
+.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
+  border-radius: 0;
 }
 
-.icon-bell {
-  background-position: -48px -144px;
+.btn-group-vertical > .btn-group:first-child > .btn:last-child,
+.btn-group-vertical > .btn-group:first-child > .dropdown-toggle {
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
 }
 
-.icon-certificate {
-  background-position: -72px -144px;
+.btn-group-vertical > .btn-group:last-child > .btn:first-child {
+  border-top-right-radius: 0;
+  border-top-left-radius: 0;
 }
 
-.icon-thumbs-up {
-  background-position: -96px -144px;
+.btn-group-justified {
+  display: table;
+  width: 100%;
+  border-collapse: separate;
+  table-layout: fixed;
 }
 
-.icon-thumbs-down {
-  background-position: -120px -144px;
+.btn-group-justified > .btn,
+.btn-group-justified > .btn-group {
+  display: table-cell;
+  float: none;
+  width: 1%;
 }
 
-.icon-hand-right {
-  background-position: -144px -144px;
+.btn-group-justified > .btn-group .btn {
+  width: 100%;
 }
 
-.icon-hand-left {
-  background-position: -168px -144px;
+[data-toggle="buttons"] > .btn > input[type="radio"],
+[data-toggle="buttons"] > .btn > input[type="checkbox"] {
+  display: none;
 }
 
-.icon-hand-up {
-  background-position: -192px -144px;
+.input-group {
+  position: relative;
+  display: table;
+  border-collapse: separate;
 }
 
-.icon-hand-down {
-  background-position: -216px -144px;
+.input-group[class*="col-"] {
+  float: none;
+  padding-right: 0;
+  padding-left: 0;
 }
 
-.icon-circle-arrow-right {
-  background-position: -240px -144px;
+.input-group .form-control {
+  width: 100%;
+  margin-bottom: 0;
 }
 
-.icon-circle-arrow-left {
-  background-position: -264px -144px;
+.input-group-lg > .form-control,
+.input-group-lg > .input-group-addon,
+.input-group-lg > .input-group-btn > .btn {
+  height: 46px;
+  padding: 10px 16px;
+  font-size: 18px;
+  line-height: 1.33;
+  border-radius: 6px;
 }
 
-.icon-circle-arrow-up {
-  background-position: -288px -144px;
+select.input-group-lg > .form-control,
+select.input-group-lg > .input-group-addon,
+select.input-group-lg > .input-group-btn > .btn {
+  height: 46px;
+  line-height: 46px;
 }
 
-.icon-circle-arrow-down {
-  background-position: -312px -144px;
+textarea.input-group-lg > .form-control,
+textarea.input-group-lg > .input-group-addon,
+textarea.input-group-lg > .input-group-btn > .btn {
+  height: auto;
 }
 
-.icon-globe {
-  background-position: -336px -144px;
+.input-group-sm > .form-control,
+.input-group-sm > .input-group-addon,
+.input-group-sm > .input-group-btn > .btn {
+  height: 30px;
+  padding: 5px 10px;
+  font-size: 12px;
+  line-height: 1.5;
+  border-radius: 3px;
 }
 
-.icon-wrench {
-  background-position: -360px -144px;
+select.input-group-sm > .form-control,
+select.input-group-sm > .input-group-addon,
+select.input-group-sm > .input-group-btn > .btn {
+  height: 30px;
+  line-height: 30px;
 }
 
-.icon-tasks {
-  background-position: -384px -144px;
+textarea.input-group-sm > .form-control,
+textarea.input-group-sm > .input-group-addon,
+textarea.input-group-sm > .input-group-btn > .btn {
+  height: auto;
 }
 
-.icon-filter {
-  background-position: -408px -144px;
+.input-group-addon,
+.input-group-btn,
+.input-group .form-control {
+  display: table-cell;
 }
 
-.icon-briefcase {
-  background-position: -432px -144px;
+.input-group-addon:not(:first-child):not(:last-child),
+.input-group-btn:not(:first-child):not(:last-child),
+.input-group .form-control:not(:first-child):not(:last-child) {
+  border-radius: 0;
 }
 
-.icon-fullscreen {
-  background-position: -456px -144px;
+.input-group-addon,
+.input-group-btn {
+  width: 1%;
+  white-space: nowrap;
+  vertical-align: middle;
 }
 
-.dropup,
-.dropdown {
-  position: relative;
+.input-group-addon {
+  padding: 6px 12px;
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 1;
+  color: #555555;
+  text-align: center;
+  background-color: #eeeeee;
+  border: 1px solid #cccccc;
+  border-radius: 4px;
 }
 
-.dropdown-toggle {
-  *margin-bottom: -3px;
+.input-group-addon.input-sm {
+  padding: 5px 10px;
+  font-size: 12px;
+  border-radius: 3px;
 }
 
-.dropdown-toggle:active,
-.open .dropdown-toggle {
-  outline: 0;
+.input-group-addon.input-lg {
+  padding: 10px 16px;
+  font-size: 18px;
+  border-radius: 6px;
 }
 
-.caret {
-  display: inline-block;
-  width: 0;
-  height: 0;
-  vertical-align: top;
-  border-top: 4px solid #000000;
-  border-right: 4px solid transparent;
-  border-left: 4px solid transparent;
-  content: "";
+.input-group-addon input[type="radio"],
+.input-group-addon input[type="checkbox"] {
+  margin-top: 0;
 }
 
-.dropdown .caret {
-  margin-top: 8px;
-  margin-left: 2px;
+.input-group .form-control:first-child,
+.input-group-addon:first-child,
+.input-group-btn:first-child > .btn,
+.input-group-btn:first-child > .dropdown-toggle,
+.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
 }
 
-.dropdown-menu {
-  position: absolute;
-  top: 100%;
-  left: 0;
-  z-index: 1000;
-  display: none;
-  float: left;
-  min-width: 160px;
-  padding: 5px 0;
-  margin: 2px 0 0;
-  list-style: none;
-  background-color: #ffffff;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-  *border-right-width: 2px;
-  *border-bottom-width: 2px;
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding;
-          background-clip: padding-box;
+.input-group-addon:first-child {
+  border-right: 0;
 }
 
-.dropdown-menu.pull-right {
-  right: 0;
-  left: auto;
+.input-group .form-control:last-child,
+.input-group-addon:last-child,
+.input-group-btn:last-child > .btn,
+.input-group-btn:last-child > .dropdown-toggle,
+.input-group-btn:first-child > .btn:not(:first-child) {
+  border-bottom-left-radius: 0;
+  border-top-left-radius: 0;
 }
 
-.dropdown-menu .divider {
-  *width: 100%;
-  height: 1px;
-  margin: 9px 1px;
-  *margin: -5px 0 5px;
-  overflow: hidden;
-  background-color: #e5e5e5;
-  border-bottom: 1px solid #ffffff;
+.input-group-addon:last-child {
+  border-left: 0;
 }
 
-.dropdown-menu > li > a {
-  display: block;
-  padding: 3px 20px;
-  clear: both;
-  font-weight: normal;
-  line-height: 20px;
-  color: #333333;
+.input-group-btn {
+  position: relative;
   white-space: nowrap;
 }
 
-.dropdown-menu > li > a:hover,
-.dropdown-menu > li > a:focus,
-.dropdown-submenu:hover > a,
-.dropdown-submenu:focus > a {
-  color: #ffffff;
-  text-decoration: none;
-  background-color: #0081c2;
-  background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
-  background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
-  background-image: -o-linear-gradient(top, #0088cc, #0077b3);
-  background-image: linear-gradient(to bottom, #0088cc, #0077b3);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
+.input-group-btn:first-child > .btn {
+  margin-right: -1px;
 }
 
-.dropdown-menu > .active > a,
-.dropdown-menu > .active > a:hover,
-.dropdown-menu > .active > a:focus {
-  color: #ffffff;
-  text-decoration: none;
-  background-color: #0081c2;
-  background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
-  background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
-  background-image: -o-linear-gradient(top, #0088cc, #0077b3);
-  background-image: linear-gradient(to bottom, #0088cc, #0077b3);
-  background-repeat: repeat-x;
-  outline: 0;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
+.input-group-btn:last-child > .btn {
+  margin-left: -1px;
 }
 
-.dropdown-menu > .disabled > a,
-.dropdown-menu > .disabled > a:hover,
-.dropdown-menu > .disabled > a:focus {
-  color: #999999;
+.input-group-btn > .btn {
+  position: relative;
 }
 
-.dropdown-menu > .disabled > a:hover,
-.dropdown-menu > .disabled > a:focus {
-  text-decoration: none;
-  cursor: default;
-  background-color: transparent;
-  background-image: none;
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+.input-group-btn > .btn + .btn {
+  margin-left: -4px;
 }
 
-.open {
-  *z-index: 1000;
+.input-group-btn > .btn:hover,
+.input-group-btn > .btn:active {
+  z-index: 2;
 }
 
-.open > .dropdown-menu {
-  display: block;
+.nav {
+  padding-left: 0;
+  margin-bottom: 0;
+  list-style: none;
 }
 
-.pull-right > .dropdown-menu {
-  right: 0;
-  left: auto;
+.nav:before,
+.nav:after {
+  display: table;
+  content: " ";
 }
 
-.dropup .caret,
-.navbar-fixed-bottom .dropdown .caret {
-  border-top: 0;
-  border-bottom: 4px solid #000000;
-  content: "";
+.nav:after {
+  clear: both;
 }
 
-.dropup .dropdown-menu,
-.navbar-fixed-bottom .dropdown .dropdown-menu {
-  top: auto;
-  bottom: 100%;
-  margin-bottom: 1px;
+.nav:before,
+.nav:after {
+  display: table;
+  content: " ";
 }
 
-.dropdown-submenu {
-  position: relative;
+.nav:after {
+  clear: both;
 }
 
-.dropdown-submenu > .dropdown-menu {
-  top: 0;
-  left: 100%;
-  margin-top: -6px;
-  margin-left: -1px;
-  -webkit-border-radius: 0 6px 6px 6px;
-     -moz-border-radius: 0 6px 6px 6px;
-          border-radius: 0 6px 6px 6px;
+.nav > li {
+  position: relative;
+  display: block;
 }
 
-.dropdown-submenu:hover > .dropdown-menu {
+.nav > li > a {
+  position: relative;
   display: block;
+  padding: 10px 15px;
 }
 
-.dropup .dropdown-submenu > .dropdown-menu {
-  top: auto;
-  bottom: 0;
-  margin-top: 0;
-  margin-bottom: -2px;
-  -webkit-border-radius: 5px 5px 5px 0;
-     -moz-border-radius: 5px 5px 5px 0;
-          border-radius: 5px 5px 5px 0;
+.nav > li > a:hover,
+.nav > li > a:focus {
+  text-decoration: none;
+  background-color: #eeeeee;
 }
 
-.dropdown-submenu > a:after {
-  display: block;
-  float: right;
-  width: 0;
-  height: 0;
-  margin-top: 5px;
-  margin-right: -10px;
-  border-color: transparent;
-  border-left-color: #cccccc;
-  border-style: solid;
-  border-width: 5px 0 5px 5px;
-  content: " ";
+.nav > li.disabled > a {
+  color: #999999;
 }
 
-.dropdown-submenu:hover > a:after {
-  border-left-color: #ffffff;
+.nav > li.disabled > a:hover,
+.nav > li.disabled > a:focus {
+  color: #999999;
+  text-decoration: none;
+  cursor: not-allowed;
+  background-color: transparent;
 }
 
-.dropdown-submenu.pull-left {
-  float: none;
+.nav .open > a,
+.nav .open > a:hover,
+.nav .open > a:focus {
+  background-color: #eeeeee;
+  border-color: #428bca;
 }
 
-.dropdown-submenu.pull-left > .dropdown-menu {
-  left: -100%;
-  margin-left: 10px;
-  -webkit-border-radius: 6px 0 6px 6px;
-     -moz-border-radius: 6px 0 6px 6px;
-          border-radius: 6px 0 6px 6px;
+.nav .nav-divider {
+  height: 1px;
+  margin: 9px 0;
+  overflow: hidden;
+  background-color: #e5e5e5;
 }
 
-.dropdown .dropdown-menu .nav-header {
-  padding-right: 20px;
-  padding-left: 20px;
+.nav > li > a > img {
+  max-width: none;
 }
 
-.typeahead {
-  z-index: 1051;
-  margin-top: 2px;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
+.nav-tabs {
+  border-bottom: 1px solid #dddddd;
 }
 
-.well {
-  min-height: 20px;
-  padding: 19px;
-  margin-bottom: 20px;
-  background-color: #f5f5f5;
-  border: 1px solid #e3e3e3;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+.nav-tabs > li {
+  float: left;
+  margin-bottom: -1px;
 }
 
-.well blockquote {
-  border-color: #ddd;
-  border-color: rgba(0, 0, 0, 0.15);
+.nav-tabs > li > a {
+  margin-right: 2px;
+  line-height: 1.428571429;
+  border: 1px solid transparent;
+  border-radius: 4px 4px 0 0;
 }
 
-.well-large {
-  padding: 24px;
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
+.nav-tabs > li > a:hover {
+  border-color: #eeeeee #eeeeee #dddddd;
 }
 
-.well-small {
-  padding: 9px;
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-          border-radius: 3px;
+.nav-tabs > li.active > a,
+.nav-tabs > li.active > a:hover,
+.nav-tabs > li.active > a:focus {
+  color: #555555;
+  cursor: default;
+  background-color: #ffffff;
+  border: 1px solid #dddddd;
+  border-bottom-color: transparent;
 }
 
-.fade {
-  opacity: 0;
-  -webkit-transition: opacity 0.15s linear;
-     -moz-transition: opacity 0.15s linear;
-       -o-transition: opacity 0.15s linear;
-          transition: opacity 0.15s linear;
+.nav-tabs.nav-justified {
+  width: 100%;
+  border-bottom: 0;
 }
 
-.fade.in {
-  opacity: 1;
+.nav-tabs.nav-justified > li {
+  float: none;
 }
 
-.collapse {
-  position: relative;
-  height: 0;
-  overflow: hidden;
-  -webkit-transition: height 0.35s ease;
-     -moz-transition: height 0.35s ease;
-       -o-transition: height 0.35s ease;
-          transition: height 0.35s ease;
+.nav-tabs.nav-justified > li > a {
+  margin-bottom: 5px;
+  text-align: center;
 }
 
-.collapse.in {
-  height: auto;
+.nav-tabs.nav-justified > .dropdown .dropdown-menu {
+  top: auto;
+  left: auto;
 }
 
-.close {
-  float: right;
-  font-size: 20px;
-  font-weight: bold;
-  line-height: 20px;
-  color: #000000;
-  text-shadow: 0 1px 0 #ffffff;
-  opacity: 0.2;
-  filter: alpha(opacity=20);
+@media (min-width: 768px) {
+  .nav-tabs.nav-justified > li {
+    display: table-cell;
+    width: 1%;
+  }
+  .nav-tabs.nav-justified > li > a {
+    margin-bottom: 0;
+  }
 }
 
-.close:hover,
-.close:focus {
-  color: #000000;
-  text-decoration: none;
-  cursor: pointer;
-  opacity: 0.4;
-  filter: alpha(opacity=40);
+.nav-tabs.nav-justified > li > a {
+  margin-right: 0;
+  border-radius: 4px;
 }
 
-button.close {
-  padding: 0;
-  cursor: pointer;
-  background: transparent;
-  border: 0;
-  -webkit-appearance: none;
+.nav-tabs.nav-justified > .active > a,
+.nav-tabs.nav-justified > .active > a:hover,
+.nav-tabs.nav-justified > .active > a:focus {
+  border: 1px solid #dddddd;
 }
 
-.btn {
-  display: inline-block;
-  *display: inline;
-  padding: 4px 12px;
-  margin-bottom: 0;
-  *margin-left: .3em;
-  font-size: 14px;
-  line-height: 20px;
-  color: #333333;
-  text-align: center;
-  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
-  vertical-align: middle;
-  cursor: pointer;
-  background-color: #f5f5f5;
-  *background-color: #e6e6e6;
-  background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
-  background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
-  background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
-  background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
-  background-repeat: repeat-x;
-  border: 1px solid #cccccc;
-  *border: 0;
-  border-color: #e6e6e6 #e6e6e6 #bfbfbf;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  border-bottom-color: #b3b3b3;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-  *zoom: 1;
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+@media (min-width: 768px) {
+  .nav-tabs.nav-justified > li > a {
+    border-bottom: 1px solid #dddddd;
+    border-radius: 4px 4px 0 0;
+  }
+  .nav-tabs.nav-justified > .active > a,
+  .nav-tabs.nav-justified > .active > a:hover,
+  .nav-tabs.nav-justified > .active > a:focus {
+    border-bottom-color: #ffffff;
+  }
 }
 
-.btn:hover,
-.btn:focus,
-.btn:active,
-.btn.active,
-.btn.disabled,
-.btn[disabled] {
-  color: #333333;
-  background-color: #e6e6e6;
-  *background-color: #d9d9d9;
+.nav-pills > li {
+  float: left;
 }
 
-.btn:active,
-.btn.active {
-  background-color: #cccccc \9;
+.nav-pills > li > a {
+  border-radius: 4px;
 }
 
-.btn:first-child {
-  *margin-left: 0;
+.nav-pills > li + li {
+  margin-left: 2px;
 }
 
-.btn:hover,
-.btn:focus {
-  color: #333333;
-  text-decoration: none;
-  background-position: 0 -15px;
-  -webkit-transition: background-position 0.1s linear;
-     -moz-transition: background-position 0.1s linear;
-       -o-transition: background-position 0.1s linear;
-          transition: background-position 0.1s linear;
+.nav-pills > li.active > a,
+.nav-pills > li.active > a:hover,
+.nav-pills > li.active > a:focus {
+  color: #ffffff;
+  background-color: #428bca;
 }
 
-.btn:focus {
-  outline: thin dotted #333;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
+.nav-stacked > li {
+  float: none;
 }
 
-.btn.active,
-.btn:active {
-  background-image: none;
-  outline: 0;
-  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+.nav-stacked > li + li {
+  margin-top: 2px;
+  margin-left: 0;
 }
 
-.btn.disabled,
-.btn[disabled] {
-  cursor: default;
-  background-image: none;
-  opacity: 0.65;
-  filter: alpha(opacity=65);
-  -webkit-box-shadow: none;
-     -moz-box-shadow: none;
-          box-shadow: none;
+.nav-justified {
+  width: 100%;
 }
 
-.btn-large {
-  padding: 11px 19px;
-  font-size: 17.5px;
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
+.nav-justified > li {
+  float: none;
 }
 
-.btn-large [class^="icon-"],
-.btn-large [class*=" icon-"] {
-  margin-top: 4px;
+.nav-justified > li > a {
+  margin-bottom: 5px;
+  text-align: center;
 }
 
-.btn-small {
-  padding: 2px 10px;
-  font-size: 11.9px;
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-          border-radius: 3px;
+.nav-justified > .dropdown .dropdown-menu {
+  top: auto;
+  left: auto;
 }
 
-.btn-small [class^="icon-"],
-.btn-small [class*=" icon-"] {
-  margin-top: 0;
+@media (min-width: 768px) {
+  .nav-justified > li {
+    display: table-cell;
+    width: 1%;
+  }
+  .nav-justified > li > a {
+    margin-bottom: 0;
+  }
 }
 
-.btn-mini [class^="icon-"],
-.btn-mini [class*=" icon-"] {
-  margin-top: -1px;
+.nav-tabs-justified {
+  border-bottom: 0;
 }
 
-.btn-mini {
-  padding: 0 6px;
-  font-size: 10.5px;
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-          border-radius: 3px;
+.nav-tabs-justified > li > a {
+  margin-right: 0;
+  border-radius: 4px;
 }
 
-.btn-block {
-  display: block;
-  width: 100%;
-  padding-right: 0;
-  padding-left: 0;
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
+.nav-tabs-justified > .active > a,
+.nav-tabs-justified > .active > a:hover,
+.nav-tabs-justified > .active > a:focus {
+  border: 1px solid #dddddd;
 }
 
-.btn-block + .btn-block {
-  margin-top: 5px;
+@media (min-width: 768px) {
+  .nav-tabs-justified > li > a {
+    border-bottom: 1px solid #dddddd;
+    border-radius: 4px 4px 0 0;
+  }
+  .nav-tabs-justified > .active > a,
+  .nav-tabs-justified > .active > a:hover,
+  .nav-tabs-justified > .active > a:focus {
+    border-bottom-color: #ffffff;
+  }
 }
 
-input[type="submit"].btn-block,
-input[type="reset"].btn-block,
-input[type="button"].btn-block {
-  width: 100%;
+.tab-content > .tab-pane {
+  display: none;
 }
 
-.btn-primary.active,
-.btn-warning.active,
-.btn-danger.active,
-.btn-success.active,
-.btn-info.active,
-.btn-inverse.active {
-  color: rgba(255, 255, 255, 0.75);
+.tab-content > .active {
+  display: block;
 }
 
-.btn-primary {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #006dcc;
-  *background-color: #0044cc;
-  background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
-  background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
-  background-image: -o-linear-gradient(top, #0088cc, #0044cc);
-  background-image: linear-gradient(to bottom, #0088cc, #0044cc);
-  background-repeat: repeat-x;
-  border-color: #0044cc #0044cc #002a80;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+.nav-tabs .dropdown-menu {
+  margin-top: -1px;
+  border-top-right-radius: 0;
+  border-top-left-radius: 0;
 }
 
-.btn-primary:hover,
-.btn-primary:focus,
-.btn-primary:active,
-.btn-primary.active,
-.btn-primary.disabled,
-.btn-primary[disabled] {
-  color: #ffffff;
-  background-color: #0044cc;
-  *background-color: #003bb3;
+.navbar {
+  position: relative;
+  min-height: 50px;
+  margin-bottom: 20px;
+  border: 1px solid transparent;
 }
 
-.btn-primary:active,
-.btn-primary.active {
-  background-color: #003399 \9;
+.navbar:before,
+.navbar:after {
+  display: table;
+  content: " ";
 }
 
-.btn-warning {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #faa732;
-  *background-color: #f89406;
-  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
-  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
-  background-image: -o-linear-gradient(top, #fbb450, #f89406);
-  background-image: linear-gradient(to bottom, #fbb450, #f89406);
-  background-repeat: repeat-x;
-  border-color: #f89406 #f89406 #ad6704;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+.navbar:after {
+  clear: both;
 }
 
-.btn-warning:hover,
-.btn-warning:focus,
-.btn-warning:active,
-.btn-warning.active,
-.btn-warning.disabled,
-.btn-warning[disabled] {
-  color: #ffffff;
-  background-color: #f89406;
-  *background-color: #df8505;
+.navbar:before,
+.navbar:after {
+  display: table;
+  content: " ";
 }
 
-.btn-warning:active,
-.btn-warning.active {
-  background-color: #c67605 \9;
+.navbar:after {
+  clear: both;
 }
 
-.btn-danger {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #da4f49;
-  *background-color: #bd362f;
-  background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));
-  background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);
-  background-image: -o-linear-gradient(top, #ee5f5b, #bd362f);
-  background-image: linear-gradient(to bottom, #ee5f5b, #bd362f);
-  background-repeat: repeat-x;
-  border-color: #bd362f #bd362f #802420;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+@media (min-width: 768px) {
+  .navbar {
+    border-radius: 4px;
+  }
 }
 
-.btn-danger:hover,
-.btn-danger:focus,
-.btn-danger:active,
-.btn-danger.active,
-.btn-danger.disabled,
-.btn-danger[disabled] {
-  color: #ffffff;
-  background-color: #bd362f;
-  *background-color: #a9302a;
+.navbar-header:before,
+.navbar-header:after {
+  display: table;
+  content: " ";
 }
 
-.btn-danger:active,
-.btn-danger.active {
-  background-color: #942a25 \9;
+.navbar-header:after {
+  clear: both;
 }
 
-.btn-success {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #5bb75b;
-  *background-color: #51a351;
-  background-image: -moz-linear-gradient(top, #62c462, #51a351);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));
-  background-image: -webkit-linear-gradient(top, #62c462, #51a351);
-  background-image: -o-linear-gradient(top, #62c462, #51a351);
-  background-image: linear-gradient(to bottom, #62c462, #51a351);
-  background-repeat: repeat-x;
-  border-color: #51a351 #51a351 #387038;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+.navbar-header:before,
+.navbar-header:after {
+  display: table;
+  content: " ";
 }
 
-.btn-success:hover,
-.btn-success:focus,
-.btn-success:active,
-.btn-success.active,
-.btn-success.disabled,
-.btn-success[disabled] {
-  color: #ffffff;
-  background-color: #51a351;
-  *background-color: #499249;
+.navbar-header:after {
+  clear: both;
 }
 
-.btn-success:active,
-.btn-success.active {
-  background-color: #408140 \9;
+@media (min-width: 768px) {
+  .navbar-header {
+    float: left;
+  }
 }
 
-.btn-info {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #49afcd;
-  *background-color: #2f96b4;
-  background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));
-  background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4);
-  background-image: -o-linear-gradient(top, #5bc0de, #2f96b4);
-  background-image: linear-gradient(to bottom, #5bc0de, #2f96b4);
-  background-repeat: repeat-x;
-  border-color: #2f96b4 #2f96b4 #1f6377;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+.navbar-collapse {
+  max-height: 340px;
+  padding-right: 15px;
+  padding-left: 15px;
+  overflow-x: visible;
+  border-top: 1px solid transparent;
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1);
+  -webkit-overflow-scrolling: touch;
 }
 
-.btn-info:hover,
-.btn-info:focus,
-.btn-info:active,
-.btn-info.active,
-.btn-info.disabled,
-.btn-info[disabled] {
-  color: #ffffff;
-  background-color: #2f96b4;
-  *background-color: #2a85a0;
+.navbar-collapse:before,
+.navbar-collapse:after {
+  display: table;
+  content: " ";
 }
 
-.btn-info:active,
-.btn-info.active {
-  background-color: #24748c \9;
+.navbar-collapse:after {
+  clear: both;
 }
 
-.btn-inverse {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #363636;
-  *background-color: #222222;
-  background-image: -moz-linear-gradient(top, #444444, #222222);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222));
-  background-image: -webkit-linear-gradient(top, #444444, #222222);
-  background-image: -o-linear-gradient(top, #444444, #222222);
-  background-image: linear-gradient(to bottom, #444444, #222222);
-  background-repeat: repeat-x;
-  border-color: #222222 #222222 #000000;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+.navbar-collapse:before,
+.navbar-collapse:after {
+  display: table;
+  content: " ";
 }
 
-.btn-inverse:hover,
-.btn-inverse:focus,
-.btn-inverse:active,
-.btn-inverse.active,
-.btn-inverse.disabled,
-.btn-inverse[disabled] {
-  color: #ffffff;
-  background-color: #222222;
-  *background-color: #151515;
+.navbar-collapse:after {
+  clear: both;
 }
 
-.btn-inverse:active,
-.btn-inverse.active {
-  background-color: #080808 \9;
+.navbar-collapse.in {
+  overflow-y: auto;
 }
 
-button.btn,
-input[type="submit"].btn {
-  *padding-top: 3px;
-  *padding-bottom: 3px;
+@media (min-width: 768px) {
+  .navbar-collapse {
+    width: auto;
+    border-top: 0;
+    box-shadow: none;
+  }
+  .navbar-collapse.collapse {
+    display: block !important;
+    height: auto !important;
+    padding-bottom: 0;
+    overflow: visible !important;
+  }
+  .navbar-collapse.in {
+    overflow-y: visible;
+  }
+  .navbar-fixed-top .navbar-collapse,
+  .navbar-static-top .navbar-collapse,
+  .navbar-fixed-bottom .navbar-collapse {
+    padding-right: 0;
+    padding-left: 0;
+  }
 }
 
-button.btn::-moz-focus-inner,
-input[type="submit"].btn::-moz-focus-inner {
-  padding: 0;
-  border: 0;
+.container > .navbar-header,
+.container > .navbar-collapse {
+  margin-right: -15px;
+  margin-left: -15px;
 }
 
-button.btn.btn-large,
-input[type="submit"].btn.btn-large {
-  *padding-top: 7px;
-  *padding-bottom: 7px;
+@media (min-width: 768px) {
+  .container > .navbar-header,
+  .container > .navbar-collapse {
+    margin-right: 0;
+    margin-left: 0;
+  }
 }
 
-button.btn.btn-small,
-input[type="submit"].btn.btn-small {
-  *padding-top: 3px;
-  *padding-bottom: 3px;
+.navbar-static-top {
+  z-index: 1000;
+  border-width: 0 0 1px;
 }
 
-button.btn.btn-mini,
-input[type="submit"].btn.btn-mini {
-  *padding-top: 1px;
-  *padding-bottom: 1px;
+@media (min-width: 768px) {
+  .navbar-static-top {
+    border-radius: 0;
+  }
 }
 
-.btn-link,
-.btn-link:active,
-.btn-link[disabled] {
-  background-color: transparent;
-  background-image: none;
-  -webkit-box-shadow: none;
-     -moz-box-shadow: none;
-          box-shadow: none;
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+  position: fixed;
+  right: 0;
+  left: 0;
+  z-index: 1030;
 }
 
-.btn-link {
-  color: #0088cc;
-  cursor: pointer;
-  border-color: transparent;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
+@media (min-width: 768px) {
+  .navbar-fixed-top,
+  .navbar-fixed-bottom {
+    border-radius: 0;
+  }
 }
 
-.btn-link:hover,
-.btn-link:focus {
-  color: #005580;
-  text-decoration: underline;
-  background-color: transparent;
+.navbar-fixed-top {
+  top: 0;
+  border-width: 0 0 1px;
 }
 
-.btn-link[disabled]:hover,
-.btn-link[disabled]:focus {
-  color: #333333;
-  text-decoration: none;
+.navbar-fixed-bottom {
+  bottom: 0;
+  margin-bottom: 0;
+  border-width: 1px 0 0;
 }
 
-.btn-group {
-  position: relative;
-  display: inline-block;
-  *display: inline;
-  *margin-left: .3em;
-  font-size: 0;
-  white-space: nowrap;
-  vertical-align: middle;
-  *zoom: 1;
+.navbar-brand {
+  float: left;
+  padding: 15px 15px;
+  font-size: 18px;
+  line-height: 20px;
 }
 
-.btn-group:first-child {
-  *margin-left: 0;
+.navbar-brand:hover,
+.navbar-brand:focus {
+  text-decoration: none;
 }
 
-.btn-group + .btn-group {
-  margin-left: 5px;
+@media (min-width: 768px) {
+  .navbar > .container .navbar-brand {
+    margin-left: -15px;
+  }
 }
 
-.btn-toolbar {
-  margin-top: 10px;
-  margin-bottom: 10px;
-  font-size: 0;
+.navbar-toggle {
+  position: relative;
+  float: right;
+  padding: 9px 10px;
+  margin-top: 8px;
+  margin-right: 15px;
+  margin-bottom: 8px;
+  background-color: transparent;
+  background-image: none;
+  border: 1px solid transparent;
+  border-radius: 4px;
 }
 
-.btn-toolbar > .btn + .btn,
-.btn-toolbar > .btn-group + .btn,
-.btn-toolbar > .btn + .btn-group {
-  margin-left: 5px;
+.navbar-toggle .icon-bar {
+  display: block;
+  width: 22px;
+  height: 2px;
+  border-radius: 1px;
 }
 
-.btn-group > .btn {
-  position: relative;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
+.navbar-toggle .icon-bar + .icon-bar {
+  margin-top: 4px;
 }
 
-.btn-group > .btn + .btn {
-  margin-left: -1px;
+@media (min-width: 768px) {
+  .navbar-toggle {
+    display: none;
+  }
 }
 
-.btn-group > .btn,
-.btn-group > .dropdown-menu,
-.btn-group > .popover {
-  font-size: 14px;
+.navbar-nav {
+  margin: 7.5px -15px;
 }
 
-.btn-group > .btn-mini {
-  font-size: 10.5px;
+.navbar-nav > li > a {
+  padding-top: 10px;
+  padding-bottom: 10px;
+  line-height: 20px;
 }
 
-.btn-group > .btn-small {
-  font-size: 11.9px;
+@media (max-width: 767px) {
+  .navbar-nav .open .dropdown-menu {
+    position: static;
+    float: none;
+    width: auto;
+    margin-top: 0;
+    background-color: transparent;
+    border: 0;
+    box-shadow: none;
+  }
+  .navbar-nav .open .dropdown-menu > li > a,
+  .navbar-nav .open .dropdown-menu .dropdown-header {
+    padding: 5px 15px 5px 25px;
+  }
+  .navbar-nav .open .dropdown-menu > li > a {
+    line-height: 20px;
+  }
+  .navbar-nav .open .dropdown-menu > li > a:hover,
+  .navbar-nav .open .dropdown-menu > li > a:focus {
+    background-image: none;
+  }
 }
 
-.btn-group > .btn-large {
-  font-size: 17.5px;
+@media (min-width: 768px) {
+  .navbar-nav {
+    float: left;
+    margin: 0;
+  }
+  .navbar-nav > li {
+    float: left;
+  }
+  .navbar-nav > li > a {
+    padding-top: 15px;
+    padding-bottom: 15px;
+  }
+  .navbar-nav.navbar-right:last-child {
+    margin-right: -15px;
+  }
 }
 
-.btn-group > .btn:first-child {
-  margin-left: 0;
-  -webkit-border-bottom-left-radius: 4px;
-          border-bottom-left-radius: 4px;
-  -webkit-border-top-left-radius: 4px;
-          border-top-left-radius: 4px;
-  -moz-border-radius-bottomleft: 4px;
-  -moz-border-radius-topleft: 4px;
+@media (min-width: 768px) {
+  .navbar-left {
+    float: left !important;
+  }
+  .navbar-right {
+    float: right !important;
+  }
 }
 
-.btn-group > .btn:last-child,
-.btn-group > .dropdown-toggle {
-  -webkit-border-top-right-radius: 4px;
-          border-top-right-radius: 4px;
-  -webkit-border-bottom-right-radius: 4px;
-          border-bottom-right-radius: 4px;
-  -moz-border-radius-topright: 4px;
-  -moz-border-radius-bottomright: 4px;
+.navbar-form {
+  padding: 10px 15px;
+  margin-top: 8px;
+  margin-right: -15px;
+  margin-bottom: 8px;
+  margin-left: -15px;
+  border-top: 1px solid transparent;
+  border-bottom: 1px solid transparent;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
 }
 
-.btn-group > .btn.large:first-child {
-  margin-left: 0;
-  -webkit-border-bottom-left-radius: 6px;
-          border-bottom-left-radius: 6px;
-  -webkit-border-top-left-radius: 6px;
-          border-top-left-radius: 6px;
-  -moz-border-radius-bottomleft: 6px;
-  -moz-border-radius-topleft: 6px;
+@media (min-width: 768px) {
+  .navbar-form .form-group {
+    display: inline-block;
+    margin-bottom: 0;
+    vertical-align: middle;
+  }
+  .navbar-form .form-control {
+    display: inline-block;
+  }
+  .navbar-form select.form-control {
+    width: auto;
+  }
+  .navbar-form .radio,
+  .navbar-form .checkbox {
+    display: inline-block;
+    padding-left: 0;
+    margin-top: 0;
+    margin-bottom: 0;
+  }
+  .navbar-form .radio input[type="radio"],
+  .navbar-form .checkbox input[type="checkbox"] {
+    float: none;
+    margin-left: 0;
+  }
 }
 
-.btn-group > .btn.large:last-child,
-.btn-group > .large.dropdown-toggle {
-  -webkit-border-top-right-radius: 6px;
-          border-top-right-radius: 6px;
-  -webkit-border-bottom-right-radius: 6px;
-          border-bottom-right-radius: 6px;
-  -moz-border-radius-topright: 6px;
-  -moz-border-radius-bottomright: 6px;
+@media (max-width: 767px) {
+  .navbar-form .form-group {
+    margin-bottom: 5px;
+  }
 }
 
-.btn-group > .btn:hover,
-.btn-group > .btn:focus,
-.btn-group > .btn:active,
-.btn-group > .btn.active {
-  z-index: 2;
+@media (min-width: 768px) {
+  .navbar-form {
+    width: auto;
+    padding-top: 0;
+    padding-bottom: 0;
+    margin-right: 0;
+    margin-left: 0;
+    border: 0;
+    -webkit-box-shadow: none;
+            box-shadow: none;
+  }
+  .navbar-form.navbar-right:last-child {
+    margin-right: -15px;
+  }
 }
 
-.btn-group .dropdown-toggle:active,
-.btn-group.open .dropdown-toggle {
-  outline: 0;
+.navbar-nav > li > .dropdown-menu {
+  margin-top: 0;
+  border-top-right-radius: 0;
+  border-top-left-radius: 0;
 }
 
-.btn-group > .btn + .dropdown-toggle {
-  *padding-top: 5px;
-  padding-right: 8px;
-  *padding-bottom: 5px;
-  padding-left: 8px;
-  -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
 }
 
-.btn-group > .btn-mini + .dropdown-toggle {
-  *padding-top: 2px;
-  padding-right: 5px;
-  *padding-bottom: 2px;
-  padding-left: 5px;
+.navbar-nav.pull-right > li > .dropdown-menu,
+.navbar-nav > li > .dropdown-menu.pull-right {
+  right: 0;
+  left: auto;
 }
 
-.btn-group > .btn-small + .dropdown-toggle {
-  *padding-top: 5px;
-  *padding-bottom: 4px;
+.navbar-btn {
+  margin-top: 8px;
+  margin-bottom: 8px;
 }
 
-.btn-group > .btn-large + .dropdown-toggle {
-  *padding-top: 7px;
-  padding-right: 12px;
-  *padding-bottom: 7px;
-  padding-left: 12px;
+.navbar-btn.btn-sm {
+  margin-top: 10px;
+  margin-bottom: 10px;
 }
 
-.btn-group.open .dropdown-toggle {
-  background-image: none;
-  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+.navbar-btn.btn-xs {
+  margin-top: 14px;
+  margin-bottom: 14px;
 }
 
-.btn-group.open .btn.dropdown-toggle {
-  background-color: #e6e6e6;
+.navbar-text {
+  margin-top: 15px;
+  margin-bottom: 15px;
 }
 
-.btn-group.open .btn-primary.dropdown-toggle {
-  background-color: #0044cc;
+@media (min-width: 768px) {
+  .navbar-text {
+    float: left;
+    margin-right: 15px;
+    margin-left: 15px;
+  }
+  .navbar-text.navbar-right:last-child {
+    margin-right: 0;
+  }
 }
 
-.btn-group.open .btn-warning.dropdown-toggle {
-  background-color: #f89406;
+.navbar-default {
+  background-color: #f8f8f8;
+  border-color: #e7e7e7;
 }
 
-.btn-group.open .btn-danger.dropdown-toggle {
-  background-color: #bd362f;
+.navbar-default .navbar-brand {
+  color: #777777;
 }
 
-.btn-group.open .btn-success.dropdown-toggle {
-  background-color: #51a351;
+.navbar-default .navbar-brand:hover,
+.navbar-default .navbar-brand:focus {
+  color: #5e5e5e;
+  background-color: transparent;
 }
 
-.btn-group.open .btn-info.dropdown-toggle {
-  background-color: #2f96b4;
+.navbar-default .navbar-text {
+  color: #777777;
 }
 
-.btn-group.open .btn-inverse.dropdown-toggle {
-  background-color: #222222;
+.navbar-default .navbar-nav > li > a {
+  color: #777777;
 }
 
-.btn .caret {
-  margin-top: 8px;
-  margin-left: 0;
+.navbar-default .navbar-nav > li > a:hover,
+.navbar-default .navbar-nav > li > a:focus {
+  color: #333333;
+  background-color: transparent;
 }
 
-.btn-large .caret {
-  margin-top: 6px;
+.navbar-default .navbar-nav > .active > a,
+.navbar-default .navbar-nav > .active > a:hover,
+.navbar-default .navbar-nav > .active > a:focus {
+  color: #555555;
+  background-color: #e7e7e7;
 }
 
-.btn-large .caret {
-  border-top-width: 5px;
-  border-right-width: 5px;
-  border-left-width: 5px;
+.navbar-default .navbar-nav > .disabled > a,
+.navbar-default .navbar-nav > .disabled > a:hover,
+.navbar-default .navbar-nav > .disabled > a:focus {
+  color: #cccccc;
+  background-color: transparent;
 }
 
-.btn-mini .caret,
-.btn-small .caret {
-  margin-top: 8px;
+.navbar-default .navbar-toggle {
+  border-color: #dddddd;
 }
 
-.dropup .btn-large .caret {
-  border-bottom-width: 5px;
+.navbar-default .navbar-toggle:hover,
+.navbar-default .navbar-toggle:focus {
+  background-color: #dddddd;
 }
 
-.btn-primary .caret,
-.btn-warning .caret,
-.btn-danger .caret,
-.btn-info .caret,
-.btn-success .caret,
-.btn-inverse .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
+.navbar-default .navbar-toggle .icon-bar {
+  background-color: #cccccc;
 }
 
-.btn-group-vertical {
-  display: inline-block;
-  *display: inline;
-  /* IE7 inline-block hack */
+.navbar-default .navbar-collapse,
+.navbar-default .navbar-form {
+  border-color: #e7e7e7;
+}
 
-  *zoom: 1;
+.navbar-default .navbar-nav > .open > a,
+.navbar-default .navbar-nav > .open > a:hover,
+.navbar-default .navbar-nav > .open > a:focus {
+  color: #555555;
+  background-color: #e7e7e7;
 }
 
-.btn-group-vertical > .btn {
-  display: block;
-  float: none;
-  max-width: 100%;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
+@media (max-width: 767px) {
+  .navbar-default .navbar-nav .open .dropdown-menu > li > a {
+    color: #777777;
+  }
+  .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover,
+  .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
+    color: #333333;
+    background-color: transparent;
+  }
+  .navbar-default .navbar-nav .open .dropdown-menu > .active > a,
+  .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover,
+  .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
+    color: #555555;
+    background-color: #e7e7e7;
+  }
+  .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a,
+  .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover,
+  .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus {
+    color: #cccccc;
+    background-color: transparent;
+  }
 }
 
-.btn-group-vertical > .btn + .btn {
-  margin-top: -1px;
-  margin-left: 0;
+.navbar-default .navbar-link {
+  color: #777777;
 }
 
-.btn-group-vertical > .btn:first-child {
-  -webkit-border-radius: 4px 4px 0 0;
-     -moz-border-radius: 4px 4px 0 0;
-          border-radius: 4px 4px 0 0;
+.navbar-default .navbar-link:hover {
+  color: #333333;
 }
 
-.btn-group-vertical > .btn:last-child {
-  -webkit-border-radius: 0 0 4px 4px;
-     -moz-border-radius: 0 0 4px 4px;
-          border-radius: 0 0 4px 4px;
+.navbar-inverse {
+  background-color: #222222;
+  border-color: #080808;
 }
 
-.btn-group-vertical > .btn-large:first-child {
-  -webkit-border-radius: 6px 6px 0 0;
-     -moz-border-radius: 6px 6px 0 0;
-          border-radius: 6px 6px 0 0;
+.navbar-inverse .navbar-brand {
+  color: #999999;
 }
 
-.btn-group-vertical > .btn-large:last-child {
-  -webkit-border-radius: 0 0 6px 6px;
-     -moz-border-radius: 0 0 6px 6px;
-          border-radius: 0 0 6px 6px;
+.navbar-inverse .navbar-brand:hover,
+.navbar-inverse .navbar-brand:focus {
+  color: #ffffff;
+  background-color: transparent;
 }
 
-.alert {
-  padding: 8px 35px 8px 14px;
-  margin-bottom: 20px;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-  background-color: #fcf8e3;
-  border: 1px solid #fbeed5;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
+.navbar-inverse .navbar-text {
+  color: #999999;
 }
 
-.alert,
-.alert h4 {
-  color: #c09853;
+.navbar-inverse .navbar-nav > li > a {
+  color: #999999;
 }
 
-.alert h4 {
-  margin: 0;
+.navbar-inverse .navbar-nav > li > a:hover,
+.navbar-inverse .navbar-nav > li > a:focus {
+  color: #ffffff;
+  background-color: transparent;
 }
 
-.alert .close {
-  position: relative;
-  top: -2px;
-  right: -21px;
-  line-height: 20px;
+.navbar-inverse .navbar-nav > .active > a,
+.navbar-inverse .navbar-nav > .active > a:hover,
+.navbar-inverse .navbar-nav > .active > a:focus {
+  color: #ffffff;
+  background-color: #080808;
 }
 
-.alert-success {
-  color: #468847;
-  background-color: #dff0d8;
-  border-color: #d6e9c6;
+.navbar-inverse .navbar-nav > .disabled > a,
+.navbar-inverse .navbar-nav > .disabled > a:hover,
+.navbar-inverse .navbar-nav > .disabled > a:focus {
+  color: #444444;
+  background-color: transparent;
 }
 
-.alert-success h4 {
-  color: #468847;
+.navbar-inverse .navbar-toggle {
+  border-color: #333333;
 }
 
-.alert-danger,
-.alert-error {
-  color: #b94a48;
-  background-color: #f2dede;
-  border-color: #eed3d7;
+.navbar-inverse .navbar-toggle:hover,
+.navbar-inverse .navbar-toggle:focus {
+  background-color: #333333;
 }
 
-.alert-danger h4,
-.alert-error h4 {
-  color: #b94a48;
+.navbar-inverse .navbar-toggle .icon-bar {
+  background-color: #ffffff;
 }
 
-.alert-info {
-  color: #3a87ad;
-  background-color: #d9edf7;
-  border-color: #bce8f1;
+.navbar-inverse .navbar-collapse,
+.navbar-inverse .navbar-form {
+  border-color: #101010;
 }
 
-.alert-info h4 {
-  color: #3a87ad;
+.navbar-inverse .navbar-nav > .open > a,
+.navbar-inverse .navbar-nav > .open > a:hover,
+.navbar-inverse .navbar-nav > .open > a:focus {
+  color: #ffffff;
+  background-color: #080808;
 }
 
-.alert-block {
-  padding-top: 14px;
-  padding-bottom: 14px;
+@media (max-width: 767px) {
+  .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {
+    border-color: #080808;
+  }
+  .navbar-inverse .navbar-nav .open .dropdown-menu .divider {
+    background-color: #080808;
+  }
+  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
+    color: #999999;
+  }
+  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover,
+  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus {
+    color: #ffffff;
+    background-color: transparent;
+  }
+  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a,
+  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover,
+  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus {
+    color: #ffffff;
+    background-color: #080808;
+  }
+  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a,
+  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover,
+  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus {
+    color: #444444;
+    background-color: transparent;
+  }
 }
 
-.alert-block > p,
-.alert-block > ul {
-  margin-bottom: 0;
+.navbar-inverse .navbar-link {
+  color: #999999;
 }
 
-.alert-block p + p {
-  margin-top: 5px;
+.navbar-inverse .navbar-link:hover {
+  color: #ffffff;
 }
 
-.nav {
+.breadcrumb {
+  padding: 8px 15px;
   margin-bottom: 20px;
-  margin-left: 0;
   list-style: none;
+  background-color: #f5f5f5;
+  border-radius: 4px;
 }
 
-.nav > li > a {
-  display: block;
+.breadcrumb > li {
+  display: inline-block;
 }
 
-.nav > li > a:hover,
-.nav > li > a:focus {
-  text-decoration: none;
-  background-color: #eeeeee;
+.breadcrumb > li + li:before {
+  padding: 0 5px;
+  color: #cccccc;
+  content: "/\00a0";
 }
 
-.nav > li > a > img {
-  max-width: none;
+.breadcrumb > .active {
+  color: #999999;
 }
 
-.nav > .pull-right {
-  float: right;
+.pagination {
+  display: inline-block;
+  padding-left: 0;
+  margin: 20px 0;
+  border-radius: 4px;
 }
 
-.nav-header {
-  display: block;
-  padding: 3px 15px;
-  font-size: 11px;
-  font-weight: bold;
-  line-height: 20px;
-  color: #999999;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-  text-transform: uppercase;
+.pagination > li {
+  display: inline;
 }
 
-.nav li + .nav-header {
-  margin-top: 9px;
+.pagination > li > a,
+.pagination > li > span {
+  position: relative;
+  float: left;
+  padding: 6px 12px;
+  margin-left: -1px;
+  line-height: 1.428571429;
+  text-decoration: none;
+  background-color: #ffffff;
+  border: 1px solid #dddddd;
 }
 
-.nav-list {
-  padding-right: 15px;
-  padding-left: 15px;
-  margin-bottom: 0;
+.pagination > li:first-child > a,
+.pagination > li:first-child > span {
+  margin-left: 0;
+  border-bottom-left-radius: 4px;
+  border-top-left-radius: 4px;
 }
 
-.nav-list > li > a,
-.nav-list .nav-header {
-  margin-right: -15px;
-  margin-left: -15px;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+.pagination > li:last-child > a,
+.pagination > li:last-child > span {
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
 }
 
-.nav-list > li > a {
-  padding: 3px 15px;
+.pagination > li > a:hover,
+.pagination > li > span:hover,
+.pagination > li > a:focus,
+.pagination > li > span:focus {
+  background-color: #eeeeee;
 }
 
-.nav-list > .active > a,
-.nav-list > .active > a:hover,
-.nav-list > .active > a:focus {
+.pagination > .active > a,
+.pagination > .active > span,
+.pagination > .active > a:hover,
+.pagination > .active > span:hover,
+.pagination > .active > a:focus,
+.pagination > .active > span:focus {
+  z-index: 2;
   color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
-  background-color: #0088cc;
-}
-
-.nav-list [class^="icon-"],
-.nav-list [class*=" icon-"] {
-  margin-right: 2px;
+  cursor: default;
+  background-color: #428bca;
+  border-color: #428bca;
 }
 
-.nav-list .divider {
-  *width: 100%;
-  height: 1px;
-  margin: 9px 1px;
-  *margin: -5px 0 5px;
-  overflow: hidden;
-  background-color: #e5e5e5;
-  border-bottom: 1px solid #ffffff;
+.pagination > .disabled > span,
+.pagination > .disabled > span:hover,
+.pagination > .disabled > span:focus,
+.pagination > .disabled > a,
+.pagination > .disabled > a:hover,
+.pagination > .disabled > a:focus {
+  color: #999999;
+  cursor: not-allowed;
+  background-color: #ffffff;
+  border-color: #dddddd;
 }
 
-.nav-tabs,
-.nav-pills {
-  *zoom: 1;
+.pagination-lg > li > a,
+.pagination-lg > li > span {
+  padding: 10px 16px;
+  font-size: 18px;
 }
 
-.nav-tabs:before,
-.nav-pills:before,
-.nav-tabs:after,
-.nav-pills:after {
-  display: table;
-  line-height: 0;
-  content: "";
+.pagination-lg > li:first-child > a,
+.pagination-lg > li:first-child > span {
+  border-bottom-left-radius: 6px;
+  border-top-left-radius: 6px;
 }
 
-.nav-tabs:after,
-.nav-pills:after {
-  clear: both;
+.pagination-lg > li:last-child > a,
+.pagination-lg > li:last-child > span {
+  border-top-right-radius: 6px;
+  border-bottom-right-radius: 6px;
 }
 
-.nav-tabs > li,
-.nav-pills > li {
-  float: left;
+.pagination-sm > li > a,
+.pagination-sm > li > span {
+  padding: 5px 10px;
+  font-size: 12px;
 }
 
-.nav-tabs > li > a,
-.nav-pills > li > a {
-  padding-right: 12px;
-  padding-left: 12px;
-  margin-right: 2px;
-  line-height: 14px;
+.pagination-sm > li:first-child > a,
+.pagination-sm > li:first-child > span {
+  border-bottom-left-radius: 3px;
+  border-top-left-radius: 3px;
 }
 
-.nav-tabs {
-  border-bottom: 1px solid #ddd;
+.pagination-sm > li:last-child > a,
+.pagination-sm > li:last-child > span {
+  border-top-right-radius: 3px;
+  border-bottom-right-radius: 3px;
 }
 
-.nav-tabs > li {
-  margin-bottom: -1px;
+.pager {
+  padding-left: 0;
+  margin: 20px 0;
+  text-align: center;
+  list-style: none;
 }
 
-.nav-tabs > li > a {
-  padding-top: 8px;
-  padding-bottom: 8px;
-  line-height: 20px;
-  border: 1px solid transparent;
-  -webkit-border-radius: 4px 4px 0 0;
-     -moz-border-radius: 4px 4px 0 0;
-          border-radius: 4px 4px 0 0;
+.pager:before,
+.pager:after {
+  display: table;
+  content: " ";
 }
 
-.nav-tabs > li > a:hover,
-.nav-tabs > li > a:focus {
-  border-color: #eeeeee #eeeeee #dddddd;
+.pager:after {
+  clear: both;
 }
 
-.nav-tabs > .active > a,
-.nav-tabs > .active > a:hover,
-.nav-tabs > .active > a:focus {
-  color: #555555;
-  cursor: default;
-  background-color: #ffffff;
-  border: 1px solid #ddd;
-  border-bottom-color: transparent;
+.pager:before,
+.pager:after {
+  display: table;
+  content: " ";
 }
 
-.nav-pills > li > a {
-  padding-top: 8px;
-  padding-bottom: 8px;
-  margin-top: 2px;
-  margin-bottom: 2px;
-  -webkit-border-radius: 5px;
-     -moz-border-radius: 5px;
-          border-radius: 5px;
+.pager:after {
+  clear: both;
 }
 
-.nav-pills > .active > a,
-.nav-pills > .active > a:hover,
-.nav-pills > .active > a:focus {
-  color: #ffffff;
-  background-color: #0088cc;
+.pager li {
+  display: inline;
 }
 
-.nav-stacked > li {
-  float: none;
+.pager li > a,
+.pager li > span {
+  display: inline-block;
+  padding: 5px 14px;
+  background-color: #ffffff;
+  border: 1px solid #dddddd;
+  border-radius: 15px;
 }
 
-.nav-stacked > li > a {
-  margin-right: 0;
+.pager li > a:hover,
+.pager li > a:focus {
+  text-decoration: none;
+  background-color: #eeeeee;
 }
 
-.nav-tabs.nav-stacked {
-  border-bottom: 0;
+.pager .next > a,
+.pager .next > span {
+  float: right;
 }
 
-.nav-tabs.nav-stacked > li > a {
-  border: 1px solid #ddd;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
+.pager .previous > a,
+.pager .previous > span {
+  float: left;
 }
 
-.nav-tabs.nav-stacked > li:first-child > a {
-  -webkit-border-top-right-radius: 4px;
-          border-top-right-radius: 4px;
-  -webkit-border-top-left-radius: 4px;
-          border-top-left-radius: 4px;
-  -moz-border-radius-topright: 4px;
-  -moz-border-radius-topleft: 4px;
+.pager .disabled > a,
+.pager .disabled > a:hover,
+.pager .disabled > a:focus,
+.pager .disabled > span {
+  color: #999999;
+  cursor: not-allowed;
+  background-color: #ffffff;
 }
 
-.nav-tabs.nav-stacked > li:last-child > a {
-  -webkit-border-bottom-right-radius: 4px;
-          border-bottom-right-radius: 4px;
-  -webkit-border-bottom-left-radius: 4px;
-          border-bottom-left-radius: 4px;
-  -moz-border-radius-bottomright: 4px;
-  -moz-border-radius-bottomleft: 4px;
+.label {
+  display: inline;
+  padding: .2em .6em .3em;
+  font-size: 75%;
+  font-weight: bold;
+  line-height: 1;
+  color: #ffffff;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: baseline;
+  border-radius: .25em;
 }
 
-.nav-tabs.nav-stacked > li > a:hover,
-.nav-tabs.nav-stacked > li > a:focus {
-  z-index: 2;
-  border-color: #ddd;
+.label[href]:hover,
+.label[href]:focus {
+  color: #ffffff;
+  text-decoration: none;
+  cursor: pointer;
 }
 
-.nav-pills.nav-stacked > li > a {
-  margin-bottom: 3px;
+.label:empty {
+  display: none;
 }
 
-.nav-pills.nav-stacked > li:last-child > a {
-  margin-bottom: 1px;
+.btn .label {
+  position: relative;
+  top: -1px;
 }
 
-.nav-tabs .dropdown-menu {
-  -webkit-border-radius: 0 0 6px 6px;
-     -moz-border-radius: 0 0 6px 6px;
-          border-radius: 0 0 6px 6px;
+.label-default {
+  background-color: #999999;
 }
 
-.nav-pills .dropdown-menu {
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
+.label-default[href]:hover,
+.label-default[href]:focus {
+  background-color: #808080;
 }
 
-.nav .dropdown-toggle .caret {
-  margin-top: 6px;
-  border-top-color: #0088cc;
-  border-bottom-color: #0088cc;
+.label-primary {
+  background-color: #428bca;
 }
 
-.nav .dropdown-toggle:hover .caret,
-.nav .dropdown-toggle:focus .caret {
-  border-top-color: #005580;
-  border-bottom-color: #005580;
+.label-primary[href]:hover,
+.label-primary[href]:focus {
+  background-color: #3071a9;
 }
 
-/* move down carets for tabs */
+.label-success {
+  background-color: #5cb85c;
+}
 
-.nav-tabs .dropdown-toggle .caret {
-  margin-top: 8px;
+.label-success[href]:hover,
+.label-success[href]:focus {
+  background-color: #449d44;
 }
 
-.nav .active .dropdown-toggle .caret {
-  border-top-color: #fff;
-  border-bottom-color: #fff;
+.label-info {
+  background-color: #5bc0de;
 }
 
-.nav-tabs .active .dropdown-toggle .caret {
-  border-top-color: #555555;
-  border-bottom-color: #555555;
+.label-info[href]:hover,
+.label-info[href]:focus {
+  background-color: #31b0d5;
 }
 
-.nav > .dropdown.active > a:hover,
-.nav > .dropdown.active > a:focus {
-  cursor: pointer;
+.label-warning {
+  background-color: #f0ad4e;
 }
 
-.nav-tabs .open .dropdown-toggle,
-.nav-pills .open .dropdown-toggle,
-.nav > li.dropdown.open.active > a:hover,
-.nav > li.dropdown.open.active > a:focus {
-  color: #ffffff;
-  background-color: #999999;
-  border-color: #999999;
+.label-warning[href]:hover,
+.label-warning[href]:focus {
+  background-color: #ec971f;
 }
 
-.nav li.dropdown.open .caret,
-.nav li.dropdown.open.active .caret,
-.nav li.dropdown.open a:hover .caret,
-.nav li.dropdown.open a:focus .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
-  opacity: 1;
-  filter: alpha(opacity=100);
+.label-danger {
+  background-color: #d9534f;
 }
 
-.tabs-stacked .open > a:hover,
-.tabs-stacked .open > a:focus {
-  border-color: #999999;
+.label-danger[href]:hover,
+.label-danger[href]:focus {
+  background-color: #c9302c;
 }
 
-.tabbable {
-  *zoom: 1;
+.badge {
+  display: inline-block;
+  min-width: 10px;
+  padding: 3px 7px;
+  font-size: 12px;
+  font-weight: bold;
+  line-height: 1;
+  color: #ffffff;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: baseline;
+  background-color: #999999;
+  border-radius: 10px;
 }
 
-.tabbable:before,
-.tabbable:after {
-  display: table;
-  line-height: 0;
-  content: "";
+.badge:empty {
+  display: none;
 }
 
-.tabbable:after {
-  clear: both;
+.btn .badge {
+  position: relative;
+  top: -1px;
 }
 
-.tab-content {
-  overflow: auto;
+a.badge:hover,
+a.badge:focus {
+  color: #ffffff;
+  text-decoration: none;
+  cursor: pointer;
 }
 
-.tabs-below > .nav-tabs,
-.tabs-right > .nav-tabs,
-.tabs-left > .nav-tabs {
-  border-bottom: 0;
+a.list-group-item.active > .badge,
+.nav-pills > .active > a > .badge {
+  color: #428bca;
+  background-color: #ffffff;
 }
 
-.tab-content > .tab-pane,
-.pill-content > .pill-pane {
-  display: none;
+.nav-pills > li > a > .badge {
+  margin-left: 3px;
 }
 
-.tab-content > .active,
-.pill-content > .active {
-  display: block;
+.jumbotron {
+  padding: 30px;
+  margin-bottom: 30px;
+  font-size: 21px;
+  font-weight: 200;
+  line-height: 2.1428571435;
+  color: inherit;
+  background-color: #eeeeee;
 }
 
-.tabs-below > .nav-tabs {
-  border-top: 1px solid #ddd;
+.jumbotron h1,
+.jumbotron .h1 {
+  line-height: 1;
+  color: inherit;
 }
 
-.tabs-below > .nav-tabs > li {
-  margin-top: -1px;
-  margin-bottom: 0;
+.jumbotron p {
+  line-height: 1.4;
 }
 
-.tabs-below > .nav-tabs > li > a {
-  -webkit-border-radius: 0 0 4px 4px;
-     -moz-border-radius: 0 0 4px 4px;
-          border-radius: 0 0 4px 4px;
+.container .jumbotron {
+  border-radius: 6px;
 }
 
-.tabs-below > .nav-tabs > li > a:hover,
-.tabs-below > .nav-tabs > li > a:focus {
-  border-top-color: #ddd;
-  border-bottom-color: transparent;
+.jumbotron .container {
+  max-width: 100%;
 }
 
-.tabs-below > .nav-tabs > .active > a,
-.tabs-below > .nav-tabs > .active > a:hover,
-.tabs-below > .nav-tabs > .active > a:focus {
-  border-color: transparent #ddd #ddd #ddd;
+@media screen and (min-width: 768px) {
+  .jumbotron {
+    padding-top: 48px;
+    padding-bottom: 48px;
+  }
+  .container .jumbotron {
+    padding-right: 60px;
+    padding-left: 60px;
+  }
+  .jumbotron h1,
+  .jumbotron .h1 {
+    font-size: 63px;
+  }
 }
 
-.tabs-left > .nav-tabs > li,
-.tabs-right > .nav-tabs > li {
-  float: none;
+.thumbnail {
+  display: block;
+  padding: 4px;
+  margin-bottom: 20px;
+  line-height: 1.428571429;
+  background-color: #ffffff;
+  border: 1px solid #dddddd;
+  border-radius: 4px;
+  -webkit-transition: all 0.2s ease-in-out;
+          transition: all 0.2s ease-in-out;
 }
 
-.tabs-left > .nav-tabs > li > a,
-.tabs-right > .nav-tabs > li > a {
-  min-width: 74px;
-  margin-right: 0;
-  margin-bottom: 3px;
+.thumbnail > img,
+.thumbnail a > img {
+  display: block;
+  height: auto;
+  max-width: 100%;
+  margin-right: auto;
+  margin-left: auto;
 }
 
-.tabs-left > .nav-tabs {
-  float: left;
-  margin-right: 19px;
-  border-right: 1px solid #ddd;
+a.thumbnail:hover,
+a.thumbnail:focus,
+a.thumbnail.active {
+  border-color: #428bca;
 }
 
-.tabs-left > .nav-tabs > li > a {
-  margin-right: -1px;
-  -webkit-border-radius: 4px 0 0 4px;
-     -moz-border-radius: 4px 0 0 4px;
-          border-radius: 4px 0 0 4px;
+.thumbnail .caption {
+  padding: 9px;
+  color: #333333;
 }
 
-.tabs-left > .nav-tabs > li > a:hover,
-.tabs-left > .nav-tabs > li > a:focus {
-  border-color: #eeeeee #dddddd #eeeeee #eeeeee;
+.alert {
+  padding: 15px;
+  margin-bottom: 20px;
+  border: 1px solid transparent;
+  border-radius: 4px;
 }
 
-.tabs-left > .nav-tabs .active > a,
-.tabs-left > .nav-tabs .active > a:hover,
-.tabs-left > .nav-tabs .active > a:focus {
-  border-color: #ddd transparent #ddd #ddd;
-  *border-right-color: #ffffff;
+.alert h4 {
+  margin-top: 0;
+  color: inherit;
 }
 
-.tabs-right > .nav-tabs {
-  float: right;
-  margin-left: 19px;
-  border-left: 1px solid #ddd;
+.alert .alert-link {
+  font-weight: bold;
 }
 
-.tabs-right > .nav-tabs > li > a {
-  margin-left: -1px;
-  -webkit-border-radius: 0 4px 4px 0;
-     -moz-border-radius: 0 4px 4px 0;
-          border-radius: 0 4px 4px 0;
+.alert > p,
+.alert > ul {
+  margin-bottom: 0;
 }
 
-.tabs-right > .nav-tabs > li > a:hover,
-.tabs-right > .nav-tabs > li > a:focus {
-  border-color: #eeeeee #eeeeee #eeeeee #dddddd;
+.alert > p + p {
+  margin-top: 5px;
 }
 
-.tabs-right > .nav-tabs .active > a,
-.tabs-right > .nav-tabs .active > a:hover,
-.tabs-right > .nav-tabs .active > a:focus {
-  border-color: #ddd #ddd #ddd transparent;
-  *border-left-color: #ffffff;
+.alert-dismissable {
+  padding-right: 35px;
 }
 
-.nav > .disabled > a {
-  color: #999999;
+.alert-dismissable .close {
+  position: relative;
+  top: -2px;
+  right: -21px;
+  color: inherit;
 }
 
-.nav > .disabled > a:hover,
-.nav > .disabled > a:focus {
-  text-decoration: none;
-  cursor: default;
-  background-color: transparent;
+.alert-success {
+  color: #3c763d;
+  background-color: #dff0d8;
+  border-color: #d6e9c6;
 }
 
-.navbar {
-  *position: relative;
-  *z-index: 2;
-  margin-bottom: 20px;
-  overflow: visible;
+.alert-success hr {
+  border-top-color: #c9e2b3;
 }
 
-.navbar-inner {
-  min-height: 40px;
-  padding-right: 20px;
-  padding-left: 20px;
-  background-color: #fafafa;
-  background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2));
-  background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2);
-  background-image: -o-linear-gradient(top, #ffffff, #f2f2f2);
-  background-image: linear-gradient(to bottom, #ffffff, #f2f2f2);
-  background-repeat: repeat-x;
-  border: 1px solid #d4d4d4;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
-  *zoom: 1;
-  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
-     -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
-          box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
-}
-
-.navbar-inner:before,
-.navbar-inner:after {
-  display: table;
-  line-height: 0;
-  content: "";
+.alert-success .alert-link {
+  color: #2b542c;
 }
 
-.navbar-inner:after {
-  clear: both;
+.alert-info {
+  color: #31708f;
+  background-color: #d9edf7;
+  border-color: #bce8f1;
 }
 
-.navbar .container {
-  width: auto;
+.alert-info hr {
+  border-top-color: #a6e1ec;
 }
 
-.nav-collapse.collapse {
-  height: auto;
-  overflow: visible;
+.alert-info .alert-link {
+  color: #245269;
 }
 
-.navbar .brand {
-  display: block;
-  float: left;
-  padding: 10px 20px 10px;
-  margin-left: -20px;
-  font-size: 20px;
-  font-weight: 200;
-  color: #777777;
-  text-shadow: 0 1px 0 #ffffff;
+.alert-warning {
+  color: #8a6d3b;
+  background-color: #fcf8e3;
+  border-color: #faebcc;
 }
 
-.navbar .brand:hover,
-.navbar .brand:focus {
-  text-decoration: none;
+.alert-warning hr {
+  border-top-color: #f7e1b5;
 }
 
-.navbar-text {
-  margin-bottom: 0;
-  line-height: 40px;
-  color: #777777;
+.alert-warning .alert-link {
+  color: #66512c;
 }
 
-.navbar-link {
-  color: #777777;
+.alert-danger {
+  color: #a94442;
+  background-color: #f2dede;
+  border-color: #ebccd1;
 }
 
-.navbar-link:hover,
-.navbar-link:focus {
-  color: #333333;
+.alert-danger hr {
+  border-top-color: #e4b9c0;
 }
 
-.navbar .divider-vertical {
-  height: 40px;
-  margin: 0 9px;
-  border-right: 1px solid #ffffff;
-  border-left: 1px solid #f2f2f2;
+.alert-danger .alert-link {
+  color: #843534;
 }
 
-.navbar .btn,
-.navbar .btn-group {
-  margin-top: 5px;
+@-webkit-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
 }
 
-.navbar .btn-group .btn,
-.navbar .input-prepend .btn,
-.navbar .input-append .btn,
-.navbar .input-prepend .btn-group,
-.navbar .input-append .btn-group {
-  margin-top: 0;
+@keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
 }
 
-.navbar-form {
-  margin-bottom: 0;
-  *zoom: 1;
+.progress {
+  height: 20px;
+  margin-bottom: 20px;
+  overflow: hidden;
+  background-color: #f5f5f5;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
 }
 
-.navbar-form:before,
-.navbar-form:after {
-  display: table;
-  line-height: 0;
-  content: "";
+.progress-bar {
+  float: left;
+  width: 0;
+  height: 100%;
+  font-size: 12px;
+  line-height: 20px;
+  color: #ffffff;
+  text-align: center;
+  background-color: #428bca;
+  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  -webkit-transition: width 0.6s ease;
+          transition: width 0.6s ease;
 }
 
-.navbar-form:after {
-  clear: both;
+.progress-striped .progress-bar {
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-size: 40px 40px;
 }
 
-.navbar-form input,
-.navbar-form select,
-.navbar-form .radio,
-.navbar-form .checkbox {
-  margin-top: 5px;
+.progress.active .progress-bar {
+  -webkit-animation: progress-bar-stripes 2s linear infinite;
+          animation: progress-bar-stripes 2s linear infinite;
 }
 
-.navbar-form input,
-.navbar-form select,
-.navbar-form .btn {
-  display: inline-block;
-  margin-bottom: 0;
+.progress-bar-success {
+  background-color: #5cb85c;
 }
 
-.navbar-form input[type="image"],
-.navbar-form input[type="checkbox"],
-.navbar-form input[type="radio"] {
-  margin-top: 3px;
+.progress-striped .progress-bar-success {
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
 }
 
-.navbar-form .input-append,
-.navbar-form .input-prepend {
-  margin-top: 5px;
-  white-space: nowrap;
+.progress-bar-info {
+  background-color: #5bc0de;
 }
 
-.navbar-form .input-append input,
-.navbar-form .input-prepend input {
-  margin-top: 0;
+.progress-striped .progress-bar-info {
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
 }
 
-.navbar-search {
-  position: relative;
-  float: left;
-  margin-top: 5px;
-  margin-bottom: 0;
+.progress-bar-warning {
+  background-color: #f0ad4e;
 }
 
-.navbar-search .search-query {
-  padding: 4px 14px;
-  margin-bottom: 0;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  font-weight: normal;
-  line-height: 1;
-  -webkit-border-radius: 15px;
-     -moz-border-radius: 15px;
-          border-radius: 15px;
+.progress-striped .progress-bar-warning {
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
 }
 
-.navbar-static-top {
-  position: static;
-  margin-bottom: 0;
+.progress-bar-danger {
+  background-color: #d9534f;
 }
 
-.navbar-static-top .navbar-inner {
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
+.progress-striped .progress-bar-danger {
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
 }
 
-.navbar-fixed-top,
-.navbar-fixed-bottom {
-  position: fixed;
-  right: 0;
-  left: 0;
-  z-index: 1030;
-  margin-bottom: 0;
+.media,
+.media-body {
+  overflow: hidden;
+  zoom: 1;
 }
 
-.navbar-fixed-top .navbar-inner,
-.navbar-static-top .navbar-inner {
-  border-width: 0 0 1px;
+.media,
+.media .media {
+  margin-top: 15px;
 }
 
-.navbar-fixed-bottom .navbar-inner {
-  border-width: 1px 0 0;
+.media:first-child {
+  margin-top: 0;
 }
 
-.navbar-fixed-top .navbar-inner,
-.navbar-fixed-bottom .navbar-inner {
-  padding-right: 0;
-  padding-left: 0;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
+.media-object {
+  display: block;
 }
 
-.navbar-static-top .container,
-.navbar-fixed-top .container,
-.navbar-fixed-bottom .container {
-  width: 940px;
+.media-heading {
+  margin: 0 0 5px;
 }
 
-.navbar-fixed-top {
-  top: 0;
+.media > .pull-left {
+  margin-right: 10px;
 }
 
-.navbar-fixed-top .navbar-inner,
-.navbar-static-top .navbar-inner {
-  -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
-     -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
-          box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
+.media > .pull-right {
+  margin-left: 10px;
 }
 
-.navbar-fixed-bottom {
-  bottom: 0;
+.media-list {
+  padding-left: 0;
+  list-style: none;
 }
 
-.navbar-fixed-bottom .navbar-inner {
-  -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
-     -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
-          box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
+.list-group {
+  padding-left: 0;
+  margin-bottom: 20px;
 }
 
-.navbar .nav {
+.list-group-item {
   position: relative;
-  left: 0;
   display: block;
-  float: left;
-  margin: 0 10px 0 0;
-}
-
-.navbar .nav.pull-right {
-  float: right;
-  margin-right: 0;
+  padding: 10px 15px;
+  margin-bottom: -1px;
+  background-color: #ffffff;
+  border: 1px solid #dddddd;
 }
 
-.navbar .nav > li {
-  float: left;
+.list-group-item:first-child {
+  border-top-right-radius: 4px;
+  border-top-left-radius: 4px;
 }
 
-.navbar .nav > li > a {
-  float: none;
-  padding: 10px 15px 10px;
-  color: #777777;
-  text-decoration: none;
-  text-shadow: 0 1px 0 #ffffff;
+.list-group-item:last-child {
+  margin-bottom: 0;
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
 }
 
-.navbar .nav .dropdown-toggle .caret {
-  margin-top: 8px;
+.list-group-item > .badge {
+  float: right;
 }
 
-.navbar .nav > li > a:focus,
-.navbar .nav > li > a:hover {
-  color: #333333;
-  text-decoration: none;
-  background-color: transparent;
+.list-group-item > .badge + .badge {
+  margin-right: 5px;
 }
 
-.navbar .nav > .active > a,
-.navbar .nav > .active > a:hover,
-.navbar .nav > .active > a:focus {
+a.list-group-item {
   color: #555555;
-  text-decoration: none;
-  background-color: #e5e5e5;
-  -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
-     -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
-          box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
 }
 
-.navbar .btn-navbar {
-  display: none;
-  float: right;
-  padding: 7px 10px;
-  margin-right: 5px;
-  margin-left: 5px;
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #ededed;
-  *background-color: #e5e5e5;
-  background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5));
-  background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5);
-  background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5);
-  background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5);
-  background-repeat: repeat-x;
-  border-color: #e5e5e5 #e5e5e5 #bfbfbf;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
-     -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+a.list-group-item .list-group-item-heading {
+  color: #333333;
 }
 
-.navbar .btn-navbar:hover,
-.navbar .btn-navbar:focus,
-.navbar .btn-navbar:active,
-.navbar .btn-navbar.active,
-.navbar .btn-navbar.disabled,
-.navbar .btn-navbar[disabled] {
-  color: #ffffff;
-  background-color: #e5e5e5;
-  *background-color: #d9d9d9;
+a.list-group-item:hover,
+a.list-group-item:focus {
+  text-decoration: none;
+  background-color: #f5f5f5;
 }
 
-.navbar .btn-navbar:active,
-.navbar .btn-navbar.active {
-  background-color: #cccccc \9;
+a.list-group-item.active,
+a.list-group-item.active:hover,
+a.list-group-item.active:focus {
+  z-index: 2;
+  color: #ffffff;
+  background-color: #428bca;
+  border-color: #428bca;
 }
 
-.navbar .btn-navbar .icon-bar {
-  display: block;
-  width: 18px;
-  height: 2px;
-  background-color: #f5f5f5;
-  -webkit-border-radius: 1px;
-     -moz-border-radius: 1px;
-          border-radius: 1px;
-  -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
-     -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
-          box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+a.list-group-item.active .list-group-item-heading,
+a.list-group-item.active:hover .list-group-item-heading,
+a.list-group-item.active:focus .list-group-item-heading {
+  color: inherit;
 }
 
-.btn-navbar .icon-bar + .icon-bar {
-  margin-top: 3px;
+a.list-group-item.active .list-group-item-text,
+a.list-group-item.active:hover .list-group-item-text,
+a.list-group-item.active:focus .list-group-item-text {
+  color: #e1edf7;
 }
 
-.navbar .nav > li > .dropdown-menu:before {
-  position: absolute;
-  top: -7px;
-  left: 9px;
-  display: inline-block;
-  border-right: 7px solid transparent;
-  border-bottom: 7px solid #ccc;
-  border-left: 7px solid transparent;
-  border-bottom-color: rgba(0, 0, 0, 0.2);
-  content: '';
+.list-group-item-heading {
+  margin-top: 0;
+  margin-bottom: 5px;
 }
 
-.navbar .nav > li > .dropdown-menu:after {
-  position: absolute;
-  top: -6px;
-  left: 10px;
-  display: inline-block;
-  border-right: 6px solid transparent;
-  border-bottom: 6px solid #ffffff;
-  border-left: 6px solid transparent;
-  content: '';
+.list-group-item-text {
+  margin-bottom: 0;
+  line-height: 1.3;
 }
 
-.navbar-fixed-bottom .nav > li > .dropdown-menu:before {
-  top: auto;
-  bottom: -7px;
-  border-top: 7px solid #ccc;
-  border-bottom: 0;
-  border-top-color: rgba(0, 0, 0, 0.2);
+.panel {
+  margin-bottom: 20px;
+  background-color: #ffffff;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
+          box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
 }
 
-.navbar-fixed-bottom .nav > li > .dropdown-menu:after {
-  top: auto;
-  bottom: -6px;
-  border-top: 6px solid #ffffff;
-  border-bottom: 0;
+.panel-body {
+  padding: 15px;
 }
 
-.navbar .nav li.dropdown > a:hover .caret,
-.navbar .nav li.dropdown > a:focus .caret {
-  border-top-color: #333333;
-  border-bottom-color: #333333;
+.panel-body:before,
+.panel-body:after {
+  display: table;
+  content: " ";
 }
 
-.navbar .nav li.dropdown.open > .dropdown-toggle,
-.navbar .nav li.dropdown.active > .dropdown-toggle,
-.navbar .nav li.dropdown.open.active > .dropdown-toggle {
-  color: #555555;
-  background-color: #e5e5e5;
+.panel-body:after {
+  clear: both;
 }
 
-.navbar .nav li.dropdown > .dropdown-toggle .caret {
-  border-top-color: #777777;
-  border-bottom-color: #777777;
+.panel-body:before,
+.panel-body:after {
+  display: table;
+  content: " ";
 }
 
-.navbar .nav li.dropdown.open > .dropdown-toggle .caret,
-.navbar .nav li.dropdown.active > .dropdown-toggle .caret,
-.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret {
-  border-top-color: #555555;
-  border-bottom-color: #555555;
+.panel-body:after {
+  clear: both;
 }
 
-.navbar .pull-right > li > .dropdown-menu,
-.navbar .nav > li > .dropdown-menu.pull-right {
-  right: 0;
-  left: auto;
+.panel > .list-group {
+  margin-bottom: 0;
 }
 
-.navbar .pull-right > li > .dropdown-menu:before,
-.navbar .nav > li > .dropdown-menu.pull-right:before {
-  right: 12px;
-  left: auto;
+.panel > .list-group .list-group-item {
+  border-width: 1px 0;
 }
 
-.navbar .pull-right > li > .dropdown-menu:after,
-.navbar .nav > li > .dropdown-menu.pull-right:after {
-  right: 13px;
-  left: auto;
+.panel > .list-group .list-group-item:first-child {
+  border-top-right-radius: 0;
+  border-top-left-radius: 0;
 }
 
-.navbar .pull-right > li > .dropdown-menu .dropdown-menu,
-.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu {
-  right: 100%;
-  left: auto;
-  margin-right: -1px;
-  margin-left: 0;
-  -webkit-border-radius: 6px 0 6px 6px;
-     -moz-border-radius: 6px 0 6px 6px;
-          border-radius: 6px 0 6px 6px;
-}
-
-.navbar-inverse .navbar-inner {
-  background-color: #1b1b1b;
-  background-image: -moz-linear-gradient(top, #222222, #111111);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111));
-  background-image: -webkit-linear-gradient(top, #222222, #111111);
-  background-image: -o-linear-gradient(top, #222222, #111111);
-  background-image: linear-gradient(to bottom, #222222, #111111);
-  background-repeat: repeat-x;
-  border-color: #252525;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
+.panel > .list-group .list-group-item:last-child {
+  border-bottom: 0;
 }
 
-.navbar-inverse .brand,
-.navbar-inverse .nav > li > a {
-  color: #999999;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+.panel-heading + .list-group .list-group-item:first-child {
+  border-top-width: 0;
 }
 
-.navbar-inverse .brand:hover,
-.navbar-inverse .nav > li > a:hover,
-.navbar-inverse .brand:focus,
-.navbar-inverse .nav > li > a:focus {
-  color: #ffffff;
+.panel > .table,
+.panel > .table-responsive > .table {
+  margin-bottom: 0;
 }
 
-.navbar-inverse .brand {
-  color: #999999;
+.panel > .panel-body + .table,
+.panel > .panel-body + .table-responsive {
+  border-top: 1px solid #dddddd;
 }
 
-.navbar-inverse .navbar-text {
-  color: #999999;
+.panel > .table > tbody:first-child th,
+.panel > .table > tbody:first-child td {
+  border-top: 0;
 }
 
-.navbar-inverse .nav > li > a:focus,
-.navbar-inverse .nav > li > a:hover {
-  color: #ffffff;
-  background-color: transparent;
+.panel > .table-bordered,
+.panel > .table-responsive > .table-bordered {
+  border: 0;
 }
 
-.navbar-inverse .nav .active > a,
-.navbar-inverse .nav .active > a:hover,
-.navbar-inverse .nav .active > a:focus {
-  color: #ffffff;
-  background-color: #111111;
+.panel > .table-bordered > thead > tr > th:first-child,
+.panel > .table-responsive > .table-bordered > thead > tr > th:first-child,
+.panel > .table-bordered > tbody > tr > th:first-child,
+.panel > .table-responsive > .table-bordered > tbody > tr > th:first-child,
+.panel > .table-bordered > tfoot > tr > th:first-child,
+.panel > .table-responsive > .table-bordered > tfoot > tr > th:first-child,
+.panel > .table-bordered > thead > tr > td:first-child,
+.panel > .table-responsive > .table-bordered > thead > tr > td:first-child,
+.panel > .table-bordered > tbody > tr > td:first-child,
+.panel > .table-responsive > .table-bordered > tbody > tr > td:first-child,
+.panel > .table-bordered > tfoot > tr > td:first-child,
+.panel > .table-responsive > .table-bordered > tfoot > tr > td:first-child {
+  border-left: 0;
 }
 
-.navbar-inverse .navbar-link {
-  color: #999999;
+.panel > .table-bordered > thead > tr > th:last-child,
+.panel > .table-responsive > .table-bordered > thead > tr > th:last-child,
+.panel > .table-bordered > tbody > tr > th:last-child,
+.panel > .table-responsive > .table-bordered > tbody > tr > th:last-child,
+.panel > .table-bordered > tfoot > tr > th:last-child,
+.panel > .table-responsive > .table-bordered > tfoot > tr > th:last-child,
+.panel > .table-bordered > thead > tr > td:last-child,
+.panel > .table-responsive > .table-bordered > thead > tr > td:last-child,
+.panel > .table-bordered > tbody > tr > td:last-child,
+.panel > .table-responsive > .table-bordered > tbody > tr > td:last-child,
+.panel > .table-bordered > tfoot > tr > td:last-child,
+.panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child {
+  border-right: 0;
+}
+
+.panel > .table-bordered > thead > tr:last-child > th,
+.panel > .table-responsive > .table-bordered > thead > tr:last-child > th,
+.panel > .table-bordered > tbody > tr:last-child > th,
+.panel > .table-responsive > .table-bordered > tbody > tr:last-child > th,
+.panel > .table-bordered > tfoot > tr:last-child > th,
+.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > th,
+.panel > .table-bordered > thead > tr:last-child > td,
+.panel > .table-responsive > .table-bordered > thead > tr:last-child > td,
+.panel > .table-bordered > tbody > tr:last-child > td,
+.panel > .table-responsive > .table-bordered > tbody > tr:last-child > td,
+.panel > .table-bordered > tfoot > tr:last-child > td,
+.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td {
+  border-bottom: 0;
 }
 
-.navbar-inverse .navbar-link:hover,
-.navbar-inverse .navbar-link:focus {
-  color: #ffffff;
+.panel > .table-responsive {
+  margin-bottom: 0;
+  border: 0;
 }
 
-.navbar-inverse .divider-vertical {
-  border-right-color: #222222;
-  border-left-color: #111111;
+.panel-heading {
+  padding: 10px 15px;
+  border-bottom: 1px solid transparent;
+  border-top-right-radius: 3px;
+  border-top-left-radius: 3px;
 }
 
-.navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
-.navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
-.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
-  color: #ffffff;
-  background-color: #111111;
+.panel-heading > .dropdown .dropdown-toggle {
+  color: inherit;
 }
 
-.navbar-inverse .nav li.dropdown > a:hover .caret,
-.navbar-inverse .nav li.dropdown > a:focus .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
+.panel-title {
+  margin-top: 0;
+  margin-bottom: 0;
+  font-size: 16px;
+  color: inherit;
 }
 
-.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret {
-  border-top-color: #999999;
-  border-bottom-color: #999999;
+.panel-title > a {
+  color: inherit;
 }
 
-.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret,
-.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret,
-.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
+.panel-footer {
+  padding: 10px 15px;
+  background-color: #f5f5f5;
+  border-top: 1px solid #dddddd;
+  border-bottom-right-radius: 3px;
+  border-bottom-left-radius: 3px;
 }
 
-.navbar-inverse .navbar-search .search-query {
-  color: #ffffff;
-  background-color: #515151;
-  border-color: #111111;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
-     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
-          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
-  -webkit-transition: none;
-     -moz-transition: none;
-       -o-transition: none;
-          transition: none;
-}
-
-.navbar-inverse .navbar-search .search-query:-moz-placeholder {
-  color: #cccccc;
+.panel-group .panel {
+  margin-bottom: 0;
+  overflow: hidden;
+  border-radius: 4px;
 }
 
-.navbar-inverse .navbar-search .search-query:-ms-input-placeholder {
-  color: #cccccc;
+.panel-group .panel + .panel {
+  margin-top: 5px;
 }
 
-.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder {
-  color: #cccccc;
+.panel-group .panel-heading {
+  border-bottom: 0;
 }
 
-.navbar-inverse .navbar-search .search-query:focus,
-.navbar-inverse .navbar-search .search-query.focused {
-  padding: 5px 15px;
-  color: #333333;
-  text-shadow: 0 1px 0 #ffffff;
-  background-color: #ffffff;
-  border: 0;
-  outline: 0;
-  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-     -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-          box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+.panel-group .panel-heading + .panel-collapse .panel-body {
+  border-top: 1px solid #dddddd;
 }
 
-.navbar-inverse .btn-navbar {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #0e0e0e;
-  *background-color: #040404;
-  background-image: -moz-linear-gradient(top, #151515, #040404);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404));
-  background-image: -webkit-linear-gradient(top, #151515, #040404);
-  background-image: -o-linear-gradient(top, #151515, #040404);
-  background-image: linear-gradient(to bottom, #151515, #040404);
-  background-repeat: repeat-x;
-  border-color: #040404 #040404 #000000;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+.panel-group .panel-footer {
+  border-top: 0;
 }
 
-.navbar-inverse .btn-navbar:hover,
-.navbar-inverse .btn-navbar:focus,
-.navbar-inverse .btn-navbar:active,
-.navbar-inverse .btn-navbar.active,
-.navbar-inverse .btn-navbar.disabled,
-.navbar-inverse .btn-navbar[disabled] {
-  color: #ffffff;
-  background-color: #040404;
-  *background-color: #000000;
+.panel-group .panel-footer + .panel-collapse .panel-body {
+  border-bottom: 1px solid #dddddd;
 }
 
-.navbar-inverse .btn-navbar:active,
-.navbar-inverse .btn-navbar.active {
-  background-color: #000000 \9;
+.panel-default {
+  border-color: #dddddd;
 }
 
-.breadcrumb {
-  padding: 8px 15px;
-  margin: 0 0 20px;
-  list-style: none;
+.panel-default > .panel-heading {
+  color: #333333;
   background-color: #f5f5f5;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
+  border-color: #dddddd;
 }
 
-.breadcrumb > li {
-  display: inline-block;
-  *display: inline;
-  text-shadow: 0 1px 0 #ffffff;
-  *zoom: 1;
+.panel-default > .panel-heading + .panel-collapse .panel-body {
+  border-top-color: #dddddd;
 }
 
-.breadcrumb > li > .divider {
-  padding: 0 5px;
-  color: #ccc;
+.panel-default > .panel-footer + .panel-collapse .panel-body {
+  border-bottom-color: #dddddd;
 }
 
-.breadcrumb > .active {
-  color: #999999;
+.panel-primary {
+  border-color: #428bca;
 }
 
-.pagination {
-  margin: 20px 0;
+.panel-primary > .panel-heading {
+  color: #ffffff;
+  background-color: #428bca;
+  border-color: #428bca;
 }
 
-.pagination ul {
-  display: inline-block;
-  *display: inline;
-  margin-bottom: 0;
-  margin-left: 0;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  *zoom: 1;
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+.panel-primary > .panel-heading + .panel-collapse .panel-body {
+  border-top-color: #428bca;
 }
 
-.pagination ul > li {
-  display: inline;
+.panel-primary > .panel-footer + .panel-collapse .panel-body {
+  border-bottom-color: #428bca;
 }
 
-.pagination ul > li > a,
-.pagination ul > li > span {
-  float: left;
-  padding: 4px 12px;
-  line-height: 20px;
-  text-decoration: none;
-  background-color: #ffffff;
-  border: 1px solid #dddddd;
-  border-left-width: 0;
+.panel-success {
+  border-color: #d6e9c6;
 }
 
-.pagination ul > li > a:hover,
-.pagination ul > li > a:focus,
-.pagination ul > .active > a,
-.pagination ul > .active > span {
-  background-color: #f5f5f5;
+.panel-success > .panel-heading {
+  color: #3c763d;
+  background-color: #dff0d8;
+  border-color: #d6e9c6;
 }
 
-.pagination ul > .active > a,
-.pagination ul > .active > span {
-  color: #999999;
-  cursor: default;
+.panel-success > .panel-heading + .panel-collapse .panel-body {
+  border-top-color: #d6e9c6;
 }
 
-.pagination ul > .disabled > span,
-.pagination ul > .disabled > a,
-.pagination ul > .disabled > a:hover,
-.pagination ul > .disabled > a:focus {
-  color: #999999;
-  cursor: default;
-  background-color: transparent;
+.panel-success > .panel-footer + .panel-collapse .panel-body {
+  border-bottom-color: #d6e9c6;
 }
 
-.pagination ul > li:first-child > a,
-.pagination ul > li:first-child > span {
-  border-left-width: 1px;
-  -webkit-border-bottom-left-radius: 4px;
-          border-bottom-left-radius: 4px;
-  -webkit-border-top-left-radius: 4px;
-          border-top-left-radius: 4px;
-  -moz-border-radius-bottomleft: 4px;
-  -moz-border-radius-topleft: 4px;
+.panel-warning {
+  border-color: #faebcc;
 }
 
-.pagination ul > li:last-child > a,
-.pagination ul > li:last-child > span {
-  -webkit-border-top-right-radius: 4px;
-          border-top-right-radius: 4px;
-  -webkit-border-bottom-right-radius: 4px;
-          border-bottom-right-radius: 4px;
-  -moz-border-radius-topright: 4px;
-  -moz-border-radius-bottomright: 4px;
+.panel-warning > .panel-heading {
+  color: #8a6d3b;
+  background-color: #fcf8e3;
+  border-color: #faebcc;
 }
 
-.pagination-centered {
-  text-align: center;
+.panel-warning > .panel-heading + .panel-collapse .panel-body {
+  border-top-color: #faebcc;
 }
 
-.pagination-right {
-  text-align: right;
+.panel-warning > .panel-footer + .panel-collapse .panel-body {
+  border-bottom-color: #faebcc;
 }
 
-.pagination-large ul > li > a,
-.pagination-large ul > li > span {
-  padding: 11px 19px;
-  font-size: 17.5px;
+.panel-danger {
+  border-color: #ebccd1;
 }
 
-.pagination-large ul > li:first-child > a,
-.pagination-large ul > li:first-child > span {
-  -webkit-border-bottom-left-radius: 6px;
-          border-bottom-left-radius: 6px;
-  -webkit-border-top-left-radius: 6px;
-          border-top-left-radius: 6px;
-  -moz-border-radius-bottomleft: 6px;
-  -moz-border-radius-topleft: 6px;
+.panel-danger > .panel-heading {
+  color: #a94442;
+  background-color: #f2dede;
+  border-color: #ebccd1;
 }
 
-.pagination-large ul > li:last-child > a,
-.pagination-large ul > li:last-child > span {
-  -webkit-border-top-right-radius: 6px;
-          border-top-right-radius: 6px;
-  -webkit-border-bottom-right-radius: 6px;
-          border-bottom-right-radius: 6px;
-  -moz-border-radius-topright: 6px;
-  -moz-border-radius-bottomright: 6px;
+.panel-danger > .panel-heading + .panel-collapse .panel-body {
+  border-top-color: #ebccd1;
 }
 
-.pagination-mini ul > li:first-child > a,
-.pagination-small ul > li:first-child > a,
-.pagination-mini ul > li:first-child > span,
-.pagination-small ul > li:first-child > span {
-  -webkit-border-bottom-left-radius: 3px;
-          border-bottom-left-radius: 3px;
-  -webkit-border-top-left-radius: 3px;
-          border-top-left-radius: 3px;
-  -moz-border-radius-bottomleft: 3px;
-  -moz-border-radius-topleft: 3px;
+.panel-danger > .panel-footer + .panel-collapse .panel-body {
+  border-bottom-color: #ebccd1;
 }
 
-.pagination-mini ul > li:last-child > a,
-.pagination-small ul > li:last-child > a,
-.pagination-mini ul > li:last-child > span,
-.pagination-small ul > li:last-child > span {
-  -webkit-border-top-right-radius: 3px;
-          border-top-right-radius: 3px;
-  -webkit-border-bottom-right-radius: 3px;
-          border-bottom-right-radius: 3px;
-  -moz-border-radius-topright: 3px;
-  -moz-border-radius-bottomright: 3px;
+.panel-info {
+  border-color: #bce8f1;
 }
 
-.pagination-small ul > li > a,
-.pagination-small ul > li > span {
-  padding: 2px 10px;
-  font-size: 11.9px;
+.panel-info > .panel-heading {
+  color: #31708f;
+  background-color: #d9edf7;
+  border-color: #bce8f1;
 }
 
-.pagination-mini ul > li > a,
-.pagination-mini ul > li > span {
-  padding: 0 6px;
-  font-size: 10.5px;
+.panel-info > .panel-heading + .panel-collapse .panel-body {
+  border-top-color: #bce8f1;
 }
 
-.pager {
-  margin: 20px 0;
-  text-align: center;
-  list-style: none;
-  *zoom: 1;
+.panel-info > .panel-footer + .panel-collapse .panel-body {
+  border-bottom-color: #bce8f1;
 }
 
-.pager:before,
-.pager:after {
-  display: table;
-  line-height: 0;
-  content: "";
+.well {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: #f5f5f5;
+  border: 1px solid #e3e3e3;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
 }
 
-.pager:after {
-  clear: both;
+.well blockquote {
+  border-color: #ddd;
+  border-color: rgba(0, 0, 0, 0.15);
 }
 
-.pager li {
-  display: inline;
+.well-lg {
+  padding: 24px;
+  border-radius: 6px;
 }
 
-.pager li > a,
-.pager li > span {
-  display: inline-block;
-  padding: 5px 14px;
-  background-color: #fff;
-  border: 1px solid #ddd;
-  -webkit-border-radius: 15px;
-     -moz-border-radius: 15px;
-          border-radius: 15px;
+.well-sm {
+  padding: 9px;
+  border-radius: 3px;
 }
 
-.pager li > a:hover,
-.pager li > a:focus {
-  text-decoration: none;
-  background-color: #f5f5f5;
+.close {
+  float: right;
+  font-size: 21px;
+  font-weight: bold;
+  line-height: 1;
+  color: #000000;
+  text-shadow: 0 1px 0 #ffffff;
+  opacity: 0.2;
+  filter: alpha(opacity=20);
 }
 
-.pager .next > a,
-.pager .next > span {
-  float: right;
+.close:hover,
+.close:focus {
+  color: #000000;
+  text-decoration: none;
+  cursor: pointer;
+  opacity: 0.5;
+  filter: alpha(opacity=50);
 }
 
-.pager .previous > a,
-.pager .previous > span {
-  float: left;
+button.close {
+  padding: 0;
+  cursor: pointer;
+  background: transparent;
+  border: 0;
+  -webkit-appearance: none;
 }
 
-.pager .disabled > a,
-.pager .disabled > a:hover,
-.pager .disabled > a:focus,
-.pager .disabled > span {
-  color: #999999;
-  cursor: default;
-  background-color: #fff;
+.modal-open {
+  overflow: hidden;
 }
 
-.modal-backdrop {
+.modal {
   position: fixed;
   top: 0;
   right: 0;
   bottom: 0;
   left: 0;
   z-index: 1040;
-  background-color: #000000;
+  display: none;
+  overflow: auto;
+  overflow-y: scroll;
 }
 
-.modal-backdrop.fade {
-  opacity: 0;
+.modal.fade .modal-dialog {
+  -webkit-transform: translate(0, -25%);
+      -ms-transform: translate(0, -25%);
+          transform: translate(0, -25%);
+  -webkit-transition: -webkit-transform 0.3s ease-out;
+     -moz-transition: -moz-transform 0.3s ease-out;
+       -o-transition: -o-transform 0.3s ease-out;
+          transition: transform 0.3s ease-out;
 }
 
-.modal-backdrop,
-.modal-backdrop.fade.in {
-  opacity: 0.8;
-  filter: alpha(opacity=80);
+.modal.in .modal-dialog {
+  -webkit-transform: translate(0, 0);
+      -ms-transform: translate(0, 0);
+          transform: translate(0, 0);
 }
 
-.modal {
-  position: fixed;
-  top: 10%;
-  left: 50%;
+.modal-dialog {
+  position: relative;
   z-index: 1050;
-  width: 560px;
-  margin-left: -280px;
+  width: auto;
+  margin: 10px;
+}
+
+.modal-content {
+  position: relative;
   background-color: #ffffff;
-  border: 1px solid #999;
-  border: 1px solid rgba(0, 0, 0, 0.3);
-  *border: 1px solid #999;
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
+  border: 1px solid #999999;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  border-radius: 6px;
   outline: none;
-  -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-     -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-          box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding-box;
-          background-clip: padding-box;
+  -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);
+          box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);
+  background-clip: padding-box;
+}
+
+.modal-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1030;
+  background-color: #000000;
 }
 
-.modal.fade {
-  top: -25%;
-  -webkit-transition: opacity 0.3s linear, top 0.3s ease-out;
-     -moz-transition: opacity 0.3s linear, top 0.3s ease-out;
-       -o-transition: opacity 0.3s linear, top 0.3s ease-out;
-          transition: opacity 0.3s linear, top 0.3s ease-out;
+.modal-backdrop.fade {
+  opacity: 0;
+  filter: alpha(opacity=0);
 }
 
-.modal.fade.in {
-  top: 10%;
+.modal-backdrop.in {
+  opacity: 0.5;
+  filter: alpha(opacity=50);
 }
 
 .modal-header {
-  padding: 9px 15px;
-  border-bottom: 1px solid #eee;
+  min-height: 16.428571429px;
+  padding: 15px;
+  border-bottom: 1px solid #e5e5e5;
 }
 
 .modal-header .close {
-  margin-top: 2px;
+  margin-top: -2px;
 }
 
-.modal-header h3 {
+.modal-title {
   margin: 0;
-  line-height: 30px;
+  line-height: 1.428571429;
 }
 
 .modal-body {
   position: relative;
-  max-height: 400px;
-  padding: 15px;
-  overflow-y: auto;
-}
-
-.modal-form {
-  margin-bottom: 0;
+  padding: 20px;
 }
 
 .modal-footer {
-  padding: 14px 15px 15px;
-  margin-bottom: 0;
+  padding: 19px 20px 20px;
+  margin-top: 15px;
   text-align: right;
-  background-color: #f5f5f5;
-  border-top: 1px solid #ddd;
-  -webkit-border-radius: 0 0 6px 6px;
-     -moz-border-radius: 0 0 6px 6px;
-          border-radius: 0 0 6px 6px;
-  *zoom: 1;
-  -webkit-box-shadow: inset 0 1px 0 #ffffff;
-     -moz-box-shadow: inset 0 1px 0 #ffffff;
-          box-shadow: inset 0 1px 0 #ffffff;
+  border-top: 1px solid #e5e5e5;
 }
 
 .modal-footer:before,
 .modal-footer:after {
   display: table;
-  line-height: 0;
-  content: "";
+  content: " ";
+}
+
+.modal-footer:after {
+  clear: both;
+}
+
+.modal-footer:before,
+.modal-footer:after {
+  display: table;
+  content: " ";
 }
 
 .modal-footer:after {
@@ -5286,11 +6064,22 @@ input[type="submit"].btn.btn-mini {
   margin-left: 0;
 }
 
+@media screen and (min-width: 768px) {
+  .modal-dialog {
+    width: 600px;
+    margin: 30px auto;
+  }
+  .modal-content {
+    -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
+            box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
+  }
+}
+
 .tooltip {
   position: absolute;
   z-index: 1030;
   display: block;
-  font-size: 11px;
+  font-size: 12px;
   line-height: 1.4;
   opacity: 0;
   filter: alpha(opacity=0);
@@ -5298,8 +6087,8 @@ input[type="submit"].btn.btn-mini {
 }
 
 .tooltip.in {
-  opacity: 0.8;
-  filter: alpha(opacity=80);
+  opacity: 0.9;
+  filter: alpha(opacity=90);
 }
 
 .tooltip.top {
@@ -5324,14 +6113,12 @@ input[type="submit"].btn.btn-mini {
 
 .tooltip-inner {
   max-width: 200px;
-  padding: 8px;
+  padding: 3px 8px;
   color: #ffffff;
   text-align: center;
   text-decoration: none;
   background-color: #000000;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
+  border-radius: 4px;
 }
 
 .tooltip-arrow {
@@ -5350,6 +6137,20 @@ input[type="submit"].btn.btn-mini {
   border-width: 5px 5px 0;
 }
 
+.tooltip.top-left .tooltip-arrow {
+  bottom: 0;
+  left: 5px;
+  border-top-color: #000000;
+  border-width: 5px 5px 0;
+}
+
+.tooltip.top-right .tooltip-arrow {
+  right: 5px;
+  bottom: 0;
+  border-top-color: #000000;
+  border-width: 5px 5px 0;
+}
+
 .tooltip.right .tooltip-arrow {
   top: 50%;
   left: 0;
@@ -5374,6 +6175,20 @@ input[type="submit"].btn.btn-mini {
   border-width: 0 5px 5px;
 }
 
+.tooltip.bottom-left .tooltip-arrow {
+  top: 0;
+  left: 5px;
+  border-bottom-color: #000000;
+  border-width: 0 5px 5px;
+}
+
+.tooltip.bottom-right .tooltip-arrow {
+  top: 0;
+  right: 5px;
+  border-bottom-color: #000000;
+  border-width: 0 5px 5px;
+}
+
 .popover {
   position: absolute;
   top: 0;
@@ -5385,17 +6200,12 @@ input[type="submit"].btn.btn-mini {
   text-align: left;
   white-space: normal;
   background-color: #ffffff;
-  border: 1px solid #ccc;
+  border: 1px solid #cccccc;
   border: 1px solid rgba(0, 0, 0, 0.2);
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
+  border-radius: 6px;
   -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
           box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding;
-          background-clip: padding-box;
+  background-clip: padding-box;
 }
 
 .popover.top {
@@ -5422,13 +6232,7 @@ input[type="submit"].btn.btn-mini {
   line-height: 18px;
   background-color: #f7f7f7;
   border-bottom: 1px solid #ebebeb;
-  -webkit-border-radius: 5px 5px 0 0;
-     -moz-border-radius: 5px 5px 0 0;
-          border-radius: 5px 5px 0 0;
-}
-
-.popover-title:empty {
-  display: none;
+  border-radius: 5px 5px 0 0;
 }
 
 .popover-content {
@@ -5458,7 +6262,7 @@ input[type="submit"].btn.btn-mini {
   bottom: -11px;
   left: 50%;
   margin-left: -11px;
-  border-top-color: #999;
+  border-top-color: #999999;
   border-top-color: rgba(0, 0, 0, 0.25);
   border-bottom-width: 0;
 }
@@ -5468,13 +6272,14 @@ input[type="submit"].btn.btn-mini {
   margin-left: -10px;
   border-top-color: #ffffff;
   border-bottom-width: 0;
+  content: " ";
 }
 
 .popover.right .arrow {
   top: 50%;
   left: -11px;
   margin-top: -11px;
-  border-right-color: #999;
+  border-right-color: #999999;
   border-right-color: rgba(0, 0, 0, 0.25);
   border-left-width: 0;
 }
@@ -5484,13 +6289,14 @@ input[type="submit"].btn.btn-mini {
   left: 1px;
   border-right-color: #ffffff;
   border-left-width: 0;
+  content: " ";
 }
 
 .popover.bottom .arrow {
   top: -11px;
   left: 50%;
   margin-left: -11px;
-  border-bottom-color: #999;
+  border-bottom-color: #999999;
   border-bottom-color: rgba(0, 0, 0, 0.25);
   border-top-width: 0;
 }
@@ -5500,13 +6306,14 @@ input[type="submit"].btn.btn-mini {
   margin-left: -10px;
   border-bottom-color: #ffffff;
   border-top-width: 0;
+  content: " ";
 }
 
 .popover.left .arrow {
   top: 50%;
   right: -11px;
   margin-top: -11px;
-  border-left-color: #999;
+  border-left-color: #999999;
   border-left-color: rgba(0, 0, 0, 0.25);
   border-right-width: 0;
 }
@@ -5516,643 +6323,796 @@ input[type="submit"].btn.btn-mini {
   bottom: -10px;
   border-left-color: #ffffff;
   border-right-width: 0;
+  content: " ";
 }
 
-.thumbnails {
-  margin-left: -20px;
-  list-style: none;
-  *zoom: 1;
+.carousel {
+  position: relative;
 }
 
-.thumbnails:before,
-.thumbnails:after {
-  display: table;
-  line-height: 0;
-  content: "";
+.carousel-inner {
+  position: relative;
+  width: 100%;
+  overflow: hidden;
 }
 
-.thumbnails:after {
-  clear: both;
+.carousel-inner > .item {
+  position: relative;
+  display: none;
+  -webkit-transition: 0.6s ease-in-out left;
+          transition: 0.6s ease-in-out left;
 }
 
-.row-fluid .thumbnails {
-  margin-left: 0;
+.carousel-inner > .item > img,
+.carousel-inner > .item > a > img {
+  display: block;
+  height: auto;
+  max-width: 100%;
+  line-height: 1;
 }
 
-.thumbnails > li {
-  float: left;
-  margin-bottom: 20px;
-  margin-left: 20px;
+.carousel-inner > .active,
+.carousel-inner > .next,
+.carousel-inner > .prev {
+  display: block;
 }
 
-.thumbnail {
-  display: block;
-  padding: 4px;
-  line-height: 20px;
-  border: 1px solid #ddd;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
-     -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
-          box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
-  -webkit-transition: all 0.2s ease-in-out;
-     -moz-transition: all 0.2s ease-in-out;
-       -o-transition: all 0.2s ease-in-out;
-          transition: all 0.2s ease-in-out;
+.carousel-inner > .active {
+  left: 0;
 }
 
-a.thumbnail:hover,
-a.thumbnail:focus {
-  border-color: #0088cc;
-  -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
-     -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
-          box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+.carousel-inner > .next,
+.carousel-inner > .prev {
+  position: absolute;
+  top: 0;
+  width: 100%;
 }
 
-.thumbnail > img {
-  display: block;
-  max-width: 100%;
-  margin-right: auto;
-  margin-left: auto;
+.carousel-inner > .next {
+  left: 100%;
 }
 
-.thumbnail .caption {
-  padding: 9px;
-  color: #555555;
+.carousel-inner > .prev {
+  left: -100%;
 }
 
-.media,
-.media-body {
-  overflow: hidden;
-  *overflow: visible;
-  zoom: 1;
+.carousel-inner > .next.left,
+.carousel-inner > .prev.right {
+  left: 0;
 }
 
-.media,
-.media .media {
-  margin-top: 15px;
+.carousel-inner > .active.left {
+  left: -100%;
 }
 
-.media:first-child {
-  margin-top: 0;
+.carousel-inner > .active.right {
+  left: 100%;
 }
 
-.media-object {
-  display: block;
+.carousel-control {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  width: 15%;
+  font-size: 20px;
+  color: #ffffff;
+  text-align: center;
+  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
+  opacity: 0.5;
+  filter: alpha(opacity=50);
 }
 
-.media-heading {
-  margin: 0 0 5px;
+.carousel-control.left {
+  background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, 0.5) 0), color-stop(rgba(0, 0, 0, 0.0001) 100%));
+  background-image: linear-gradient(to right, rgba(0, 0, 0, 0.5) 0, rgba(0, 0, 0, 0.0001) 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);
 }
 
-.media > .pull-left {
-  margin-right: 10px;
+.carousel-control.right {
+  right: 0;
+  left: auto;
+  background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, 0.0001) 0), color-stop(rgba(0, 0, 0, 0.5) 100%));
+  background-image: linear-gradient(to right, rgba(0, 0, 0, 0.0001) 0, rgba(0, 0, 0, 0.5) 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);
 }
 
-.media > .pull-right {
-  margin-left: 10px;
+.carousel-control:hover,
+.carousel-control:focus {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  opacity: 0.9;
+  filter: alpha(opacity=90);
 }
 
-.media-list {
-  margin-left: 0;
+.carousel-control .icon-prev,
+.carousel-control .icon-next,
+.carousel-control .glyphicon-chevron-left,
+.carousel-control .glyphicon-chevron-right {
+  position: absolute;
+  top: 50%;
+  z-index: 5;
+  display: inline-block;
+}
+
+.carousel-control .icon-prev,
+.carousel-control .glyphicon-chevron-left {
+  left: 50%;
+}
+
+.carousel-control .icon-next,
+.carousel-control .glyphicon-chevron-right {
+  right: 50%;
+}
+
+.carousel-control .icon-prev,
+.carousel-control .icon-next {
+  width: 20px;
+  height: 20px;
+  margin-top: -10px;
+  margin-left: -10px;
+  font-family: serif;
+}
+
+.carousel-control .icon-prev:before {
+  content: '\2039';
+}
+
+.carousel-control .icon-next:before {
+  content: '\203a';
+}
+
+.carousel-indicators {
+  position: absolute;
+  bottom: 10px;
+  left: 50%;
+  z-index: 15;
+  width: 60%;
+  padding-left: 0;
+  margin-left: -30%;
+  text-align: center;
   list-style: none;
 }
 
-.label,
-.badge {
+.carousel-indicators li {
   display: inline-block;
-  padding: 2px 4px;
-  font-size: 11.844px;
-  font-weight: bold;
-  line-height: 14px;
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  white-space: nowrap;
-  vertical-align: baseline;
-  background-color: #999999;
+  width: 10px;
+  height: 10px;
+  margin: 1px;
+  text-indent: -999px;
+  cursor: pointer;
+  background-color: #000 \9;
+  background-color: rgba(0, 0, 0, 0);
+  border: 1px solid #ffffff;
+  border-radius: 10px;
 }
 
-.label {
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-          border-radius: 3px;
+.carousel-indicators .active {
+  width: 12px;
+  height: 12px;
+  margin: 0;
+  background-color: #ffffff;
 }
 
-.badge {
-  padding-right: 9px;
-  padding-left: 9px;
-  -webkit-border-radius: 9px;
-     -moz-border-radius: 9px;
-          border-radius: 9px;
+.carousel-caption {
+  position: absolute;
+  right: 15%;
+  bottom: 20px;
+  left: 15%;
+  z-index: 10;
+  padding-top: 20px;
+  padding-bottom: 20px;
+  color: #ffffff;
+  text-align: center;
+  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
 }
 
-.label:empty,
-.badge:empty {
-  display: none;
+.carousel-caption .btn {
+  text-shadow: none;
 }
 
-a.label:hover,
-a.label:focus,
-a.badge:hover,
-a.badge:focus {
-  color: #ffffff;
-  text-decoration: none;
-  cursor: pointer;
+@media screen and (min-width: 768px) {
+  .carousel-control .glyphicons-chevron-left,
+  .carousel-control .glyphicons-chevron-right,
+  .carousel-control .icon-prev,
+  .carousel-control .icon-next {
+    width: 30px;
+    height: 30px;
+    margin-top: -15px;
+    margin-left: -15px;
+    font-size: 30px;
+  }
+  .carousel-caption {
+    right: 20%;
+    left: 20%;
+    padding-bottom: 30px;
+  }
+  .carousel-indicators {
+    bottom: 20px;
+  }
+}
+
+.clearfix:before,
+.clearfix:after {
+  display: table;
+  content: " ";
 }
 
-.label-important,
-.badge-important {
-  background-color: #b94a48;
+.clearfix:after {
+  clear: both;
 }
 
-.label-important[href],
-.badge-important[href] {
-  background-color: #953b39;
+.center-block {
+  display: block;
+  margin-right: auto;
+  margin-left: auto;
 }
 
-.label-warning,
-.badge-warning {
-  background-color: #f89406;
+.pull-right {
+  float: right !important;
 }
 
-.label-warning[href],
-.badge-warning[href] {
-  background-color: #c67605;
+.pull-left {
+  float: left !important;
 }
 
-.label-success,
-.badge-success {
-  background-color: #468847;
+.hide {
+  display: none;
 }
 
-.label-success[href],
-.badge-success[href] {
-  background-color: #356635;
+.show {
+  display: block !important;
 }
 
-.label-info,
-.badge-info {
-  background-color: #3a87ad;
+.invisible {
+  visibility: hidden;
 }
 
-.label-info[href],
-.badge-info[href] {
-  background-color: #2d6987;
+.text-hide {
+  font: 0/0 a;
+  color: transparent;
+  text-shadow: none;
+  background-color: transparent;
+  border: 0;
 }
 
-.label-inverse,
-.badge-inverse {
-  background-color: #333333;
+.hidden {
+  display: none !important;
+  visibility: hidden !important;
 }
 
-.label-inverse[href],
-.badge-inverse[href] {
-  background-color: #1a1a1a;
+.affix {
+  position: fixed;
 }
 
-.btn .label,
-.btn .badge {
-  position: relative;
-  top: -1px;
+@-ms-viewport {
+  width: device-width;
 }
 
-.btn-mini .label,
-.btn-mini .badge {
-  top: 0;
+.visible-xs,
+tr.visible-xs,
+th.visible-xs,
+td.visible-xs {
+  display: none !important;
 }
 
-@-webkit-keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
+@media (max-width: 767px) {
+  .visible-xs {
+    display: block !important;
   }
-  to {
-    background-position: 0 0;
+  table.visible-xs {
+    display: table;
   }
-}
-
-@-moz-keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
+  tr.visible-xs {
+    display: table-row !important;
   }
-  to {
-    background-position: 0 0;
+  th.visible-xs,
+  td.visible-xs {
+    display: table-cell !important;
   }
 }
 
-@-ms-keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
+@media (min-width: 768px) and (max-width: 991px) {
+  .visible-xs.visible-sm {
+    display: block !important;
   }
-  to {
-    background-position: 0 0;
+  table.visible-xs.visible-sm {
+    display: table;
   }
-}
-
-@-o-keyframes progress-bar-stripes {
-  from {
-    background-position: 0 0;
+  tr.visible-xs.visible-sm {
+    display: table-row !important;
   }
-  to {
-    background-position: 40px 0;
+  th.visible-xs.visible-sm,
+  td.visible-xs.visible-sm {
+    display: table-cell !important;
   }
 }
 
-@keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
+@media (min-width: 992px) and (max-width: 1199px) {
+  .visible-xs.visible-md {
+    display: block !important;
   }
-  to {
-    background-position: 0 0;
+  table.visible-xs.visible-md {
+    display: table;
+  }
+  tr.visible-xs.visible-md {
+    display: table-row !important;
+  }
+  th.visible-xs.visible-md,
+  td.visible-xs.visible-md {
+    display: table-cell !important;
   }
 }
 
-.progress {
-  height: 20px;
-  margin-bottom: 20px;
-  overflow: hidden;
-  background-color: #f7f7f7;
-  background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));
-  background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9);
-  background-repeat: repeat-x;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+@media (min-width: 1200px) {
+  .visible-xs.visible-lg {
+    display: block !important;
+  }
+  table.visible-xs.visible-lg {
+    display: table;
+  }
+  tr.visible-xs.visible-lg {
+    display: table-row !important;
+  }
+  th.visible-xs.visible-lg,
+  td.visible-xs.visible-lg {
+    display: table-cell !important;
+  }
 }
 
-.progress .bar {
-  float: left;
-  width: 0;
-  height: 100%;
-  font-size: 12px;
-  color: #ffffff;
-  text-align: center;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #0e90d2;
-  background-image: -moz-linear-gradient(top, #149bdf, #0480be);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));
-  background-image: -webkit-linear-gradient(top, #149bdf, #0480be);
-  background-image: -o-linear-gradient(top, #149bdf, #0480be);
-  background-image: linear-gradient(to bottom, #149bdf, #0480be);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);
-  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-     -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-  -webkit-transition: width 0.6s ease;
-     -moz-transition: width 0.6s ease;
-       -o-transition: width 0.6s ease;
-          transition: width 0.6s ease;
+.visible-sm,
+tr.visible-sm,
+th.visible-sm,
+td.visible-sm {
+  display: none !important;
 }
 
-.progress .bar + .bar {
-  -webkit-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-     -moz-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-          box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+@media (max-width: 767px) {
+  .visible-sm.visible-xs {
+    display: block !important;
+  }
+  table.visible-sm.visible-xs {
+    display: table;
+  }
+  tr.visible-sm.visible-xs {
+    display: table-row !important;
+  }
+  th.visible-sm.visible-xs,
+  td.visible-sm.visible-xs {
+    display: table-cell !important;
+  }
 }
 
-.progress-striped .bar {
-  background-color: #149bdf;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  -webkit-background-size: 40px 40px;
-     -moz-background-size: 40px 40px;
-       -o-background-size: 40px 40px;
-          background-size: 40px 40px;
+@media (min-width: 768px) and (max-width: 991px) {
+  .visible-sm {
+    display: block !important;
+  }
+  table.visible-sm {
+    display: table;
+  }
+  tr.visible-sm {
+    display: table-row !important;
+  }
+  th.visible-sm,
+  td.visible-sm {
+    display: table-cell !important;
+  }
 }
 
-.progress.active .bar {
-  -webkit-animation: progress-bar-stripes 2s linear infinite;
-     -moz-animation: progress-bar-stripes 2s linear infinite;
-      -ms-animation: progress-bar-stripes 2s linear infinite;
-       -o-animation: progress-bar-stripes 2s linear infinite;
-          animation: progress-bar-stripes 2s linear infinite;
+@media (min-width: 992px) and (max-width: 1199px) {
+  .visible-sm.visible-md {
+    display: block !important;
+  }
+  table.visible-sm.visible-md {
+    display: table;
+  }
+  tr.visible-sm.visible-md {
+    display: table-row !important;
+  }
+  th.visible-sm.visible-md,
+  td.visible-sm.visible-md {
+    display: table-cell !important;
+  }
 }
 
-.progress-danger .bar,
-.progress .bar-danger {
-  background-color: #dd514c;
-  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
-  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: linear-gradient(to bottom, #ee5f5b, #c43c35);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0);
+@media (min-width: 1200px) {
+  .visible-sm.visible-lg {
+    display: block !important;
+  }
+  table.visible-sm.visible-lg {
+    display: table;
+  }
+  tr.visible-sm.visible-lg {
+    display: table-row !important;
+  }
+  th.visible-sm.visible-lg,
+  td.visible-sm.visible-lg {
+    display: table-cell !important;
+  }
 }
 
-.progress-danger.progress-striped .bar,
-.progress-striped .bar-danger {
-  background-color: #ee5f5b;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+.visible-md,
+tr.visible-md,
+th.visible-md,
+td.visible-md {
+  display: none !important;
 }
 
-.progress-success .bar,
-.progress .bar-success {
-  background-color: #5eb95e;
-  background-image: -moz-linear-gradient(top, #62c462, #57a957);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
-  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
-  background-image: -o-linear-gradient(top, #62c462, #57a957);
-  background-image: linear-gradient(to bottom, #62c462, #57a957);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0);
+@media (max-width: 767px) {
+  .visible-md.visible-xs {
+    display: block !important;
+  }
+  table.visible-md.visible-xs {
+    display: table;
+  }
+  tr.visible-md.visible-xs {
+    display: table-row !important;
+  }
+  th.visible-md.visible-xs,
+  td.visible-md.visible-xs {
+    display: table-cell !important;
+  }
 }
 
-.progress-success.progress-striped .bar,
-.progress-striped .bar-success {
-  background-color: #62c462;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+@media (min-width: 768px) and (max-width: 991px) {
+  .visible-md.visible-sm {
+    display: block !important;
+  }
+  table.visible-md.visible-sm {
+    display: table;
+  }
+  tr.visible-md.visible-sm {
+    display: table-row !important;
+  }
+  th.visible-md.visible-sm,
+  td.visible-md.visible-sm {
+    display: table-cell !important;
+  }
 }
 
-.progress-info .bar,
-.progress .bar-info {
-  background-color: #4bb1cf;
-  background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
-  background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: linear-gradient(to bottom, #5bc0de, #339bb9);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0);
+@media (min-width: 992px) and (max-width: 1199px) {
+  .visible-md {
+    display: block !important;
+  }
+  table.visible-md {
+    display: table;
+  }
+  tr.visible-md {
+    display: table-row !important;
+  }
+  th.visible-md,
+  td.visible-md {
+    display: table-cell !important;
+  }
 }
 
-.progress-info.progress-striped .bar,
-.progress-striped .bar-info {
-  background-color: #5bc0de;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+@media (min-width: 1200px) {
+  .visible-md.visible-lg {
+    display: block !important;
+  }
+  table.visible-md.visible-lg {
+    display: table;
+  }
+  tr.visible-md.visible-lg {
+    display: table-row !important;
+  }
+  th.visible-md.visible-lg,
+  td.visible-md.visible-lg {
+    display: table-cell !important;
+  }
 }
 
-.progress-warning .bar,
-.progress .bar-warning {
-  background-color: #faa732;
-  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
-  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
-  background-image: -o-linear-gradient(top, #fbb450, #f89406);
-  background-image: linear-gradient(to bottom, #fbb450, #f89406);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
+.visible-lg,
+tr.visible-lg,
+th.visible-lg,
+td.visible-lg {
+  display: none !important;
 }
 
-.progress-warning.progress-striped .bar,
-.progress-striped .bar-warning {
-  background-color: #fbb450;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+@media (max-width: 767px) {
+  .visible-lg.visible-xs {
+    display: block !important;
+  }
+  table.visible-lg.visible-xs {
+    display: table;
+  }
+  tr.visible-lg.visible-xs {
+    display: table-row !important;
+  }
+  th.visible-lg.visible-xs,
+  td.visible-lg.visible-xs {
+    display: table-cell !important;
+  }
 }
 
-.accordion {
-  margin-bottom: 20px;
+@media (min-width: 768px) and (max-width: 991px) {
+  .visible-lg.visible-sm {
+    display: block !important;
+  }
+  table.visible-lg.visible-sm {
+    display: table;
+  }
+  tr.visible-lg.visible-sm {
+    display: table-row !important;
+  }
+  th.visible-lg.visible-sm,
+  td.visible-lg.visible-sm {
+    display: table-cell !important;
+  }
 }
 
-.accordion-group {
-  margin-bottom: 2px;
-  border: 1px solid #e5e5e5;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
+@media (min-width: 992px) and (max-width: 1199px) {
+  .visible-lg.visible-md {
+    display: block !important;
+  }
+  table.visible-lg.visible-md {
+    display: table;
+  }
+  tr.visible-lg.visible-md {
+    display: table-row !important;
+  }
+  th.visible-lg.visible-md,
+  td.visible-lg.visible-md {
+    display: table-cell !important;
+  }
 }
 
-.accordion-heading {
-  border-bottom: 0;
+@media (min-width: 1200px) {
+  .visible-lg {
+    display: block !important;
+  }
+  table.visible-lg {
+    display: table;
+  }
+  tr.visible-lg {
+    display: table-row !important;
+  }
+  th.visible-lg,
+  td.visible-lg {
+    display: table-cell !important;
+  }
 }
 
-.accordion-heading .accordion-toggle {
-  display: block;
-  padding: 8px 15px;
+.hidden-xs {
+  display: block !important;
 }
 
-.accordion-toggle {
-  cursor: pointer;
+table.hidden-xs {
+  display: table;
 }
 
-.accordion-inner {
-  padding: 9px 15px;
-  border-top: 1px solid #e5e5e5;
+tr.hidden-xs {
+  display: table-row !important;
 }
 
-.carousel {
-  position: relative;
-  margin-bottom: 20px;
-  line-height: 1;
+th.hidden-xs,
+td.hidden-xs {
+  display: table-cell !important;
 }
 
-.carousel-inner {
-  position: relative;
-  width: 100%;
-  overflow: hidden;
+@media (max-width: 767px) {
+  .hidden-xs,
+  tr.hidden-xs,
+  th.hidden-xs,
+  td.hidden-xs {
+    display: none !important;
+  }
 }
 
-.carousel-inner > .item {
-  position: relative;
-  display: none;
-  -webkit-transition: 0.6s ease-in-out left;
-     -moz-transition: 0.6s ease-in-out left;
-       -o-transition: 0.6s ease-in-out left;
-          transition: 0.6s ease-in-out left;
+@media (min-width: 768px) and (max-width: 991px) {
+  .hidden-xs.hidden-sm,
+  tr.hidden-xs.hidden-sm,
+  th.hidden-xs.hidden-sm,
+  td.hidden-xs.hidden-sm {
+    display: none !important;
+  }
 }
 
-.carousel-inner > .item > img,
-.carousel-inner > .item > a > img {
-  display: block;
-  line-height: 1;
+@media (min-width: 992px) and (max-width: 1199px) {
+  .hidden-xs.hidden-md,
+  tr.hidden-xs.hidden-md,
+  th.hidden-xs.hidden-md,
+  td.hidden-xs.hidden-md {
+    display: none !important;
+  }
 }
 
-.carousel-inner > .active,
-.carousel-inner > .next,
-.carousel-inner > .prev {
-  display: block;
+@media (min-width: 1200px) {
+  .hidden-xs.hidden-lg,
+  tr.hidden-xs.hidden-lg,
+  th.hidden-xs.hidden-lg,
+  td.hidden-xs.hidden-lg {
+    display: none !important;
+  }
 }
 
-.carousel-inner > .active {
-  left: 0;
+.hidden-sm {
+  display: block !important;
 }
 
-.carousel-inner > .next,
-.carousel-inner > .prev {
-  position: absolute;
-  top: 0;
-  width: 100%;
+table.hidden-sm {
+  display: table;
 }
 
-.carousel-inner > .next {
-  left: 100%;
+tr.hidden-sm {
+  display: table-row !important;
 }
 
-.carousel-inner > .prev {
-  left: -100%;
+th.hidden-sm,
+td.hidden-sm {
+  display: table-cell !important;
 }
 
-.carousel-inner > .next.left,
-.carousel-inner > .prev.right {
-  left: 0;
+@media (max-width: 767px) {
+  .hidden-sm.hidden-xs,
+  tr.hidden-sm.hidden-xs,
+  th.hidden-sm.hidden-xs,
+  td.hidden-sm.hidden-xs {
+    display: none !important;
+  }
 }
 
-.carousel-inner > .active.left {
-  left: -100%;
+@media (min-width: 768px) and (max-width: 991px) {
+  .hidden-sm,
+  tr.hidden-sm,
+  th.hidden-sm,
+  td.hidden-sm {
+    display: none !important;
+  }
 }
 
-.carousel-inner > .active.right {
-  left: 100%;
+@media (min-width: 992px) and (max-width: 1199px) {
+  .hidden-sm.hidden-md,
+  tr.hidden-sm.hidden-md,
+  th.hidden-sm.hidden-md,
+  td.hidden-sm.hidden-md {
+    display: none !important;
+  }
 }
 
-.carousel-control {
-  position: absolute;
-  top: 40%;
-  left: 15px;
-  width: 40px;
-  height: 40px;
-  margin-top: -20px;
-  font-size: 60px;
-  font-weight: 100;
-  line-height: 30px;
-  color: #ffffff;
-  text-align: center;
-  background: #222222;
-  border: 3px solid #ffffff;
-  -webkit-border-radius: 23px;
-     -moz-border-radius: 23px;
-          border-radius: 23px;
-  opacity: 0.5;
-  filter: alpha(opacity=50);
+@media (min-width: 1200px) {
+  .hidden-sm.hidden-lg,
+  tr.hidden-sm.hidden-lg,
+  th.hidden-sm.hidden-lg,
+  td.hidden-sm.hidden-lg {
+    display: none !important;
+  }
 }
 
-.carousel-control.right {
-  right: 15px;
-  left: auto;
+.hidden-md {
+  display: block !important;
 }
 
-.carousel-control:hover,
-.carousel-control:focus {
-  color: #ffffff;
-  text-decoration: none;
-  opacity: 0.9;
-  filter: alpha(opacity=90);
+table.hidden-md {
+  display: table;
 }
 
-.carousel-indicators {
-  position: absolute;
-  top: 15px;
-  right: 15px;
-  z-index: 5;
-  margin: 0;
-  list-style: none;
+tr.hidden-md {
+  display: table-row !important;
 }
 
-.carousel-indicators li {
-  display: block;
-  float: left;
-  width: 10px;
-  height: 10px;
-  margin-left: 5px;
-  text-indent: -999px;
-  background-color: #ccc;
-  background-color: rgba(255, 255, 255, 0.25);
-  border-radius: 5px;
+th.hidden-md,
+td.hidden-md {
+  display: table-cell !important;
 }
 
-.carousel-indicators .active {
-  background-color: #fff;
+@media (max-width: 767px) {
+  .hidden-md.hidden-xs,
+  tr.hidden-md.hidden-xs,
+  th.hidden-md.hidden-xs,
+  td.hidden-md.hidden-xs {
+    display: none !important;
+  }
 }
 
-.carousel-caption {
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  padding: 15px;
-  background: #333333;
-  background: rgba(0, 0, 0, 0.75);
+@media (min-width: 768px) and (max-width: 991px) {
+  .hidden-md.hidden-sm,
+  tr.hidden-md.hidden-sm,
+  th.hidden-md.hidden-sm,
+  td.hidden-md.hidden-sm {
+    display: none !important;
+  }
 }
 
-.carousel-caption h4,
-.carousel-caption p {
-  line-height: 20px;
-  color: #ffffff;
+@media (min-width: 992px) and (max-width: 1199px) {
+  .hidden-md,
+  tr.hidden-md,
+  th.hidden-md,
+  td.hidden-md {
+    display: none !important;
+  }
 }
 
-.carousel-caption h4 {
-  margin: 0 0 5px;
+@media (min-width: 1200px) {
+  .hidden-md.hidden-lg,
+  tr.hidden-md.hidden-lg,
+  th.hidden-md.hidden-lg,
+  td.hidden-md.hidden-lg {
+    display: none !important;
+  }
 }
 
-.carousel-caption p {
-  margin-bottom: 0;
+.hidden-lg {
+  display: block !important;
 }
 
-.hero-unit {
-  padding: 60px;
-  margin-bottom: 30px;
-  font-size: 18px;
-  font-weight: 200;
-  line-height: 30px;
-  color: inherit;
-  background-color: #eeeeee;
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
+table.hidden-lg {
+  display: table;
 }
 
-.hero-unit h1 {
-  margin-bottom: 0;
-  font-size: 60px;
-  line-height: 1;
-  letter-spacing: -1px;
-  color: inherit;
+tr.hidden-lg {
+  display: table-row !important;
 }
 
-.hero-unit li {
-  line-height: 30px;
+th.hidden-lg,
+td.hidden-lg {
+  display: table-cell !important;
 }
 
-.pull-right {
-  float: right;
+@media (max-width: 767px) {
+  .hidden-lg.hidden-xs,
+  tr.hidden-lg.hidden-xs,
+  th.hidden-lg.hidden-xs,
+  td.hidden-lg.hidden-xs {
+    display: none !important;
+  }
 }
 
-.pull-left {
-  float: left;
+@media (min-width: 768px) and (max-width: 991px) {
+  .hidden-lg.hidden-sm,
+  tr.hidden-lg.hidden-sm,
+  th.hidden-lg.hidden-sm,
+  td.hidden-lg.hidden-sm {
+    display: none !important;
+  }
 }
 
-.hide {
-  display: none;
+@media (min-width: 992px) and (max-width: 1199px) {
+  .hidden-lg.hidden-md,
+  tr.hidden-lg.hidden-md,
+  th.hidden-lg.hidden-md,
+  td.hidden-lg.hidden-md {
+    display: none !important;
+  }
 }
 
-.show {
-  display: block;
+@media (min-width: 1200px) {
+  .hidden-lg,
+  tr.hidden-lg,
+  th.hidden-lg,
+  td.hidden-lg {
+    display: none !important;
+  }
 }
 
-.invisible {
-  visibility: hidden;
+.visible-print,
+tr.visible-print,
+th.visible-print,
+td.visible-print {
+  display: none !important;
 }
 
-.affix {
-  position: fixed;
-}
+@media print {
+  .visible-print {
+    display: block !important;
+  }
+  table.visible-print {
+    display: table;
+  }
+  tr.visible-print {
+    display: table-row !important;
+  }
+  th.visible-print,
+  td.visible-print {
+    display: table-cell !important;
+  }
+  .hidden-print,
+  tr.hidden-print,
+  th.hidden-print,
+  td.hidden-print {
+    display: none !important;
+  }
+}
\ No newline at end of file
diff --git a/shared/vendor/css/font-awesome/css/font-awesome.css b/shared/vendor/css/font-awesome/css/font-awesome.css
index c06e9a0eb9d..8de471689c2 100644
--- a/shared/vendor/css/font-awesome/css/font-awesome.css
+++ b/shared/vendor/css/font-awesome/css/font-awesome.css
@@ -1,33 +1,34 @@
 /*!
- *  Font Awesome 3.1.0
+ *  Font Awesome 3.2.1
  *  the iconic font designed for Bootstrap
- *  -------------------------------------------------------
- *  The full suite of pictographic icons, examples, and documentation
- *  can be found at: http://fontawesome.io
+ *  ------------------------------------------------------------------------------
+ *  The full suite of pictographic icons, examples, and documentation can be
+ *  found at http://fontawesome.io.  Stay up to date on Twitter at
+ *  http://twitter.com/fontawesome.
  *
  *  License
- *  -------------------------------------------------------
- *  - The Font Awesome font is licensed under the SIL Open Font License v1.1 -
+ *  ------------------------------------------------------------------------------
+ *  - The Font Awesome font is licensed under SIL OFL 1.1 -
  *    http://scripts.sil.org/OFL
- *  - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License -
+ *  - Font Awesome CSS, LESS, and SASS files are licensed under MIT License -
  *    http://opensource.org/licenses/mit-license.html
- *  - Font Awesome documentation licensed under CC BY 3.0 License -
+ *  - Font Awesome documentation licensed under CC BY 3.0 -
  *    http://creativecommons.org/licenses/by/3.0/
  *  - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
  *    "Font Awesome by Dave Gandy - http://fontawesome.io"
-
- *  Contact
- *  -------------------------------------------------------
+ *
+ *  Author - Dave Gandy
+ *  ------------------------------------------------------------------------------
  *  Email: dave@fontawesome.io
- *  Twitter: http://twitter.com/fortaweso_me
- *  Work: Lead Product Designer @ http://kyruus.com
+ *  Twitter: http://twitter.com/davegandy
+ *  Work: Lead Product Designer @ Kyruus - http://kyruus.com
  */
 /* FONT PATH
  * -------------------------- */
 @font-face {
   font-family: 'FontAwesome';
-  src: url('/shared/vendor/css/font-awesome/font/fontawesome-webfont.eot?v=3.1.0');
-  src: url('/shared/vendor/css/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.1.0') format('embedded-opentype'), url('/shared/vendor/css/font-awesome/font/fontawesome-webfont.woff?v=3.1.0') format('woff'), url('/shared/vendor/css/font-awesome/font/fontawesome-webfont.ttf?v=3.1.0') format('truetype'), url('/shared/vendor/css/font-awesome/font/fontawesome-webfont.svg#fontawesomeregular?v=3.1.0') format('svg');
+  src: url('/shared/vendor/css/font-awesome/font/fontawesome-webfont.eot?v=3.2.1');
+  src: url('/shared/vendor/css/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), url('/shared/vendor/css/font-awesome/font/fontawesome-webfont.woff?v=3.2.1') format('woff'), url('/shared/vendor/css/font-awesome/font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), url('/shared/vendor/css/font-awesome/font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -55,31 +56,34 @@
 }
 /* makes sure icons active on rollover in links */
 a [class^="icon-"],
-a [class*=" icon-"],
-a [class^="icon-"]:before,
-a [class*=" icon-"]:before {
+a [class*=" icon-"] {
   display: inline;
 }
 /* increased font size for icon-large */
 [class^="icon-"].icon-fixed-width,
 [class*=" icon-"].icon-fixed-width {
   display: inline-block;
-  width: 1.2857142857142858em;
-  text-align: center;
+  width: 1.1428571428571428em;
+  text-align: right;
+  padding-right: 0.2857142857142857em;
 }
 [class^="icon-"].icon-fixed-width.icon-large,
 [class*=" icon-"].icon-fixed-width.icon-large {
-  width: 1.5714285714285714em;
+  width: 1.4285714285714286em;
 }
-ul.icons-ul {
-  list-style-type: none;
-  text-indent: -0.7142857142857143em;
+.icons-ul {
   margin-left: 2.142857142857143em;
+  list-style-type: none;
 }
-ul.icons-ul > li .icon-li {
-  width: 0.7142857142857143em;
-  display: inline-block;
+.icons-ul > li {
+  position: relative;
+}
+.icons-ul .icon-li {
+  position: absolute;
+  left: -2.142857142857143em;
+  width: 2.142857142857143em;
   text-align: center;
+  line-height: inherit;
 }
 [class^="icon-"].hide,
 [class*=" icon-"].hide {
@@ -239,6 +243,11 @@ ul.icons-ul > li .icon-li {
 .btn.btn-large [class*=" icon-"].pull-right.icon-2x {
   margin-left: .2em;
 }
+/* Fixes alignment in nav lists */
+.nav-list [class^="icon-"],
+.nav-list [class*=" icon-"] {
+  line-height: inherit;
+}
 /* EXTRAS
  * -------------------------- */
 /* Stacked and layered icon */
@@ -273,6 +282,12 @@ ul.icons-ul > li .icon-li {
   -webkit-animation: spin 2s infinite linear;
   animation: spin 2s infinite linear;
 }
+/* Prevent stack and spinners from being taken inline when inside a link */
+a .icon-stack,
+a .icon-spin {
+  display: inline-block;
+  text-decoration: none;
+}
 @-moz-keyframes spin {
   0% {
     -moz-transform: rotate(0deg);
@@ -352,6 +367,14 @@ ul.icons-ul > li .icon-li {
   -o-transform: scale(1, -1);
   transform: scale(1, -1);
 }
+/* ensure rotation occurs inside anchor tags */
+a .icon-rotate-90:before,
+a .icon-rotate-180:before,
+a .icon-rotate-270:before,
+a .icon-flip-horizontal:before,
+a .icon-flip-vertical:before {
+  display: inline-block;
+}
 /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
    readers do not read off random characters that represent icons */
 .icon-glass:before {
@@ -363,7 +386,7 @@ ul.icons-ul > li .icon-li {
 .icon-search:before {
   content: "\f002";
 }
-.icon-envelope:before {
+.icon-envelope-alt:before {
   content: "\f003";
 }
 .icon-heart:before {
@@ -402,12 +425,14 @@ ul.icons-ul > li .icon-li {
 .icon-zoom-out:before {
   content: "\f010";
 }
+.icon-power-off:before,
 .icon-off:before {
   content: "\f011";
 }
 .icon-signal:before {
   content: "\f012";
 }
+.icon-gear:before,
 .icon-cog:before {
   content: "\f013";
 }
@@ -417,7 +442,7 @@ ul.icons-ul > li .icon-li {
 .icon-home:before {
   content: "\f015";
 }
-.icon-file:before {
+.icon-file-alt:before {
   content: "\f016";
 }
 .icon-time:before {
@@ -441,11 +466,10 @@ ul.icons-ul > li .icon-li {
 .icon-play-circle:before {
   content: "\f01d";
 }
-.icon-repeat:before,
-.icon-rotate-right:before {
+.icon-rotate-right:before,
+.icon-repeat:before {
   content: "\f01e";
 }
-/* F020 doesn't work in Safari. all shifted one down */
 .icon-refresh:before {
   content: "\f021";
 }
@@ -638,8 +662,8 @@ ul.icons-ul > li .icon-li {
 .icon-arrow-down:before {
   content: "\f063";
 }
-.icon-share-alt:before,
-.icon-mail-forward:before {
+.icon-mail-forward:before,
+.icon-share-alt:before {
   content: "\f064";
 }
 .icon-resize-full:before {
@@ -732,16 +756,17 @@ ul.icons-ul > li .icon-li {
 .icon-key:before {
   content: "\f084";
 }
+.icon-gears:before,
 .icon-cogs:before {
   content: "\f085";
 }
 .icon-comments:before {
   content: "\f086";
 }
-.icon-thumbs-up:before {
+.icon-thumbs-up-alt:before {
   content: "\f087";
 }
-.icon-thumbs-down:before {
+.icon-thumbs-down-alt:before {
   content: "\f088";
 }
 .icon-star-half:before {
@@ -780,6 +805,7 @@ ul.icons-ul > li .icon-li {
 .icon-phone:before {
   content: "\f095";
 }
+.icon-unchecked:before,
 .icon-check-empty:before {
   content: "\f096";
 }
@@ -879,6 +905,7 @@ ul.icons-ul > li .icon-li {
 .icon-copy:before {
   content: "\f0c5";
 }
+.icon-paperclip:before,
 .icon-paper-clip:before {
   content: "\f0c6";
 }
@@ -951,14 +978,14 @@ ul.icons-ul > li .icon-li {
 .icon-sort-up:before {
   content: "\f0de";
 }
-.icon-envelope-alt:before {
+.icon-envelope:before {
   content: "\f0e0";
 }
 .icon-linkedin:before {
   content: "\f0e1";
 }
-.icon-undo:before,
-.icon-rotate-left:before {
+.icon-rotate-left:before,
+.icon-undo:before {
   content: "\f0e2";
 }
 .icon-legal:before {
@@ -1015,7 +1042,7 @@ ul.icons-ul > li .icon-li {
 .icon-food:before {
   content: "\f0f5";
 }
-.icon-file-alt:before {
+.icon-file-text-alt:before {
   content: "\f0f6";
 }
 .icon-building:before {
@@ -1093,10 +1120,13 @@ ul.icons-ul > li .icon-li {
 .icon-circle:before {
   content: "\f111";
 }
-.icon-reply:before,
-.icon-mail-reply:before {
+.icon-mail-reply:before,
+.icon-reply:before {
   content: "\f112";
 }
+.icon-github-alt:before {
+  content: "\f113";
+}
 .icon-folder-close-alt:before {
   content: "\f114";
 }
@@ -1266,3 +1296,184 @@ ul.icons-ul > li .icon-li {
 .icon-share-sign:before {
   content: "\f14d";
 }
+.icon-compass:before {
+  content: "\f14e";
+}
+.icon-collapse:before {
+  content: "\f150";
+}
+.icon-collapse-top:before {
+  content: "\f151";
+}
+.icon-expand:before {
+  content: "\f152";
+}
+.icon-euro:before,
+.icon-eur:before {
+  content: "\f153";
+}
+.icon-gbp:before {
+  content: "\f154";
+}
+.icon-dollar:before,
+.icon-usd:before {
+  content: "\f155";
+}
+.icon-rupee:before,
+.icon-inr:before {
+  content: "\f156";
+}
+.icon-yen:before,
+.icon-jpy:before {
+  content: "\f157";
+}
+.icon-renminbi:before,
+.icon-cny:before {
+  content: "\f158";
+}
+.icon-won:before,
+.icon-krw:before {
+  content: "\f159";
+}
+.icon-bitcoin:before,
+.icon-btc:before {
+  content: "\f15a";
+}
+.icon-file:before {
+  content: "\f15b";
+}
+.icon-file-text:before {
+  content: "\f15c";
+}
+.icon-sort-by-alphabet:before {
+  content: "\f15d";
+}
+.icon-sort-by-alphabet-alt:before {
+  content: "\f15e";
+}
+.icon-sort-by-attributes:before {
+  content: "\f160";
+}
+.icon-sort-by-attributes-alt:before {
+  content: "\f161";
+}
+.icon-sort-by-order:before {
+  content: "\f162";
+}
+.icon-sort-by-order-alt:before {
+  content: "\f163";
+}
+.icon-thumbs-up:before {
+  content: "\f164";
+}
+.icon-thumbs-down:before {
+  content: "\f165";
+}
+.icon-youtube-sign:before {
+  content: "\f166";
+}
+.icon-youtube:before {
+  content: "\f167";
+}
+.icon-xing:before {
+  content: "\f168";
+}
+.icon-xing-sign:before {
+  content: "\f169";
+}
+.icon-youtube-play:before {
+  content: "\f16a";
+}
+.icon-dropbox:before {
+  content: "\f16b";
+}
+.icon-stackexchange:before {
+  content: "\f16c";
+}
+.icon-instagram:before {
+  content: "\f16d";
+}
+.icon-flickr:before {
+  content: "\f16e";
+}
+.icon-adn:before {
+  content: "\f170";
+}
+.icon-bitbucket:before {
+  content: "\f171";
+}
+.icon-bitbucket-sign:before {
+  content: "\f172";
+}
+.icon-tumblr:before {
+  content: "\f173";
+}
+.icon-tumblr-sign:before {
+  content: "\f174";
+}
+.icon-long-arrow-down:before {
+  content: "\f175";
+}
+.icon-long-arrow-up:before {
+  content: "\f176";
+}
+.icon-long-arrow-left:before {
+  content: "\f177";
+}
+.icon-long-arrow-right:before {
+  content: "\f178";
+}
+.icon-apple:before {
+  content: "\f179";
+}
+.icon-windows:before {
+  content: "\f17a";
+}
+.icon-android:before {
+  content: "\f17b";
+}
+.icon-linux:before {
+  content: "\f17c";
+}
+.icon-dribbble:before {
+  content: "\f17d";
+}
+.icon-skype:before {
+  content: "\f17e";
+}
+.icon-foursquare:before {
+  content: "\f180";
+}
+.icon-trello:before {
+  content: "\f181";
+}
+.icon-female:before {
+  content: "\f182";
+}
+.icon-male:before {
+  content: "\f183";
+}
+.icon-gittip:before {
+  content: "\f184";
+}
+.icon-sun:before {
+  content: "\f185";
+}
+.icon-moon:before {
+  content: "\f186";
+}
+.icon-archive:before {
+  content: "\f187";
+}
+.icon-bug:before {
+  content: "\f188";
+}
+.icon-vk:before {
+  content: "\f189";
+}
+.icon-weibo:before {
+  content: "\f18a";
+}
+.icon-renren:before {
+  content: "\f18b";
+}
diff --git a/shared/vendor/css/font-awesome/font/FontAwesome.otf b/shared/vendor/css/font-awesome/font/FontAwesome.otf
index 32dd8b1cd54..70125459f7d 100644
Binary files a/shared/vendor/css/font-awesome/font/FontAwesome.otf and b/shared/vendor/css/font-awesome/font/FontAwesome.otf differ
diff --git a/shared/vendor/css/font-awesome/font/fontawesome-webfont.eot b/shared/vendor/css/font-awesome/font/fontawesome-webfont.eot
index c080283bdd7..0662cb96bfb 100755
Binary files a/shared/vendor/css/font-awesome/font/fontawesome-webfont.eot and b/shared/vendor/css/font-awesome/font/fontawesome-webfont.eot differ
diff --git a/shared/vendor/css/font-awesome/font/fontawesome-webfont.svg b/shared/vendor/css/font-awesome/font/fontawesome-webfont.svg
index 10a1e1bbf74..2edb4ec34cb 100755
--- a/shared/vendor/css/font-awesome/font/fontawesome-webfont.svg
+++ b/shared/vendor/css/font-awesome/font/fontawesome-webfont.svg
@@ -52,8 +52,8 @@
 <glyph unicode="&#xf013;" d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38 q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13 l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22 q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
 <glyph unicode="&#xf014;" horiz-adv-x="1408" d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832 q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
 <glyph unicode="&#xf015;" horiz-adv-x="1664" d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5 l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
-<glyph unicode="&#xf016;" horiz-adv-x="1280" d="M128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280zM768 896h299l-299 299v-299zM1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h544q40 0 88 -20t76 -48l408 -408q28 -28 48 -76t20 -88z" />
-<glyph unicode="&#xf017;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM768 96q148 0 273 73t198 198t73 273t-73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273 t73 -273t198 -198t273 -73zM1024 640q26 0 45 -19t19 -45v-96q0 -26 -19 -45t-45 -19h-416q-26 0 -45 19t-19 45v480q0 26 19 45t45 19h96q26 0 45 -19t19 -45v-320h256z" />
+<glyph unicode="&#xf016;" horiz-adv-x="1280" d="M128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280zM768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z " />
+<glyph unicode="&#xf017;" d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
 <glyph unicode="&#xf018;" horiz-adv-x="1920" d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256 q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
 <glyph unicode="&#xf019;" horiz-adv-x="1664" d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136 q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
 <glyph unicode="&#xf01a;" d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273 t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
@@ -63,7 +63,7 @@
 <glyph unicode="&#xf01e;" d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q14 0 25 -9 l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
 <glyph unicode="&#xf021;" d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117 q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5 q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />
 <glyph unicode="&#xf022;" horiz-adv-x="1792" d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5 t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47 t47 -113z" />
-<glyph unicode="&#xf023;" horiz-adv-x="1152" d="M704 512q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5q0 -37 19 -67t51 -47l-69 -229q-5 -15 5 -28t26 -13h192q16 0 26 13t5 28l-69 229q32 17 51 47t19 67zM320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68 t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
+<glyph unicode="&#xf023;" horiz-adv-x="1152" d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
 <glyph unicode="&#xf024;" horiz-adv-x="1792" d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48 t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />
 <glyph unicode="&#xf025;" horiz-adv-x="1664" d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78 t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5 t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />
 <glyph unicode="&#xf026;" horiz-adv-x="768" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
@@ -138,7 +138,7 @@
 <glyph unicode="&#xf06e;" horiz-adv-x="1792" d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5 t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />
 <glyph unicode="&#xf070;" horiz-adv-x="1792" d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9 q-105 -188 -315 -566t-316 -567l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5 q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z " />
 <glyph unicode="&#xf071;" horiz-adv-x="1792" d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185 q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
-<glyph unicode="&#xf072;" horiz-adv-x="1408" d="M1376 1376q44 -52 12 -148t-108 -172l-225 -225l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-195 -195l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9 q6 0 8 -1l194 -53l195 195l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l224 224q76 76 172 108t148 -12z" />
+<glyph unicode="&#xf072;" horiz-adv-x="1408" d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9 q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
 <glyph unicode="&#xf073;" horiz-adv-x="1664" d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64 q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47 h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
 <glyph unicode="&#xf074;" horiz-adv-x="1792" d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1 t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5 v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111 t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
 <glyph unicode="&#xf075;" horiz-adv-x="1792" d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281 q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
@@ -178,7 +178,7 @@
 <glyph unicode="&#xf099;" horiz-adv-x="1664" d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
 <glyph unicode="&#xf09a;" horiz-adv-x="768" d="M511 980h257l-30 -284h-227v-824h-341v824h-170v284h170v171q0 182 86 275.5t283 93.5h227v-284h-142q-39 0 -62.5 -6.5t-34 -23.5t-13.5 -34.5t-3 -49.5v-142z" />
 <glyph unicode="&#xf09b;" d="M1536 640q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -39.5 7t-12.5 30v211q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5 q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23 q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -89t0.5 -54q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf09c;" horiz-adv-x="1664" d="M704 160q0 6 -15 57t-35 115.5t-20 65.5q32 16 51 47t19 67q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5q0 -36 19 -66.5t51 -47.5q0 -2 -20 -66t-35 -115t-15 -57q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1664 960v-256q0 -26 -19 -45t-45 -19 h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5z" />
+<glyph unicode="&#xf09c;" horiz-adv-x="1664" d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5 t316.5 -131.5t131.5 -316.5z" />
 <glyph unicode="&#xf09d;" horiz-adv-x="1920" d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608 q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
 <glyph unicode="&#xf09e;" horiz-adv-x="1408" d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294 q187 -186 294 -425.5t120 -501.5z" />
 <glyph unicode="&#xf0a0;" d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5 h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75 l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
@@ -193,7 +193,7 @@
 <glyph unicode="&#xf0a9;" d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
 <glyph unicode="&#xf0aa;" d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
 <glyph unicode="&#xf0ab;" d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0ac;" d="M1193 993q11 7 25 22v-1q0 -2 -9.5 -10t-11.5 -12q-1 1 -4 1zM1187 992q-1 1 -2.5 3t-1.5 3q3 -2 10 -5q-6 -4 -6 -1zM728 1175q-16 2 -26 5q1 0 6.5 -1t10.5 -2t9 -2zM773 1212q7 4 13.5 2.5t7.5 -7.5q-5 3 -21 5zM765 1206l-3 2q-2 3 -5.5 5t-4.5 2q2 -1 21 -3 q-6 -4 -8 -6zM663 1290v2q1 -2 3 -5.5t3 -5.5zM558 1250q0 -2 -1 -2l-1 2h2zM933 206v-1v1zM768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1240 162 l5 5q-7 10 -29 12q1 12 -14 26.5t-27 15.5q0 4 -10.5 11t-17.5 8q-9 2 -27 -9q-7 -3 -4 -5q-3 3 -12 11t-16 11q-2 1 -7.5 1t-8.5 2q-1 1 -6 4.5t-7 4.5t-6.5 3t-7.5 1.5t-7.5 -2.5t-8.5 -6t-4.5 -15.5t-2.5 -14.5q-8 6 -0.5 20t1.5 20q-7 7 -21 0.5t-21 -15.5 q-1 -1 -9.5 -5.5t-11.5 -7.5q-4 -6 -9 -17.5t-6 -13.5q0 2 -2.5 6.5t-2.5 6.5q-12 -2 -16 3q5 -16 8 -17l-4 2q-1 -6 3 -15t4 -11q1 -5 -1.5 -13t-2.5 -11q0 -2 5 -11q4 -19 -2 -32q0 -1 -3.5 -7t-6.5 -11l-2 -5l-2 1q-1 1 -2 0q-1 -6 -9 -13t-10 -11q-15 -23 -9 -38 q3 -8 10 -10q3 -1 3 2q1 -9 -11 -27q1 -1 4 -3q-17 0 -10 -14q202 36 352 181h-3zM680 347q16 3 30.5 -16t22.5 -23q41 -20 59 -11q0 -9 14 -28q3 -4 6.5 -11.5t5.5 -10.5q5 -7 19 -16t19 -16q6 3 9 9q13 -35 24 -34q5 0 8 8q0 -1 -0.5 -3t-1.5 -3q7 15 5 26l6 4q5 4 5 5 q-6 6 -9 -3q-30 -14 -48 22q-2 3 -4.5 8t-5 12t-1.5 11.5t6 4.5q11 0 12.5 1.5t-2.5 6t-4 7.5q-1 4 -1.5 12.5t-1.5 12.5l-5 6q-5 6 -11.5 13.5t-7.5 9.5q-4 -10 -16.5 -8.5t-18.5 9.5q1 -2 -0.5 -6.5t-1.5 -6.5q-14 0 -17 1q1 6 3 21t4 22q1 5 5.5 13.5t8 15.5t4.5 14 t-4.5 10.5t-18.5 2.5q-20 -1 -29 -22q-1 -3 -3 -11.5t-5 -12.5t-9 -7q-8 -3 -27 -2t-26 5q-14 8 -24 30.5t-11 41.5q0 10 3 27.5t3 27t-6 26.5q3 2 10 10.5t11 11.5q2 2 5 2h5t4 2t3 6q-1 1 -4 3q-3 3 -4 3q4 -3 19 -1t19 2q0 1 22 0q17 -13 24 2q0 1 -2.5 10.5t-0.5 14.5 q5 -29 32 -10q3 -4 16.5 -6t18.5 -5q3 -2 7 -5.5t6 -5t6 -0.5t9 7q11 -17 13 -25q11 -43 20 -48q8 -2 12.5 -2t5 10.5t0 15.5t-1.5 13l-2 37q-16 3 -20 12.5t1.5 20t16.5 19.5q1 1 16.5 8t21.5 12q24 19 17 39q9 -2 11 9l-5 3q-4 3 -8 5.5t-5 1.5q11 7 2 18q5 3 8 11.5 t9 11.5q9 -14 22 -3q8 9 2 18q5 8 22 11.5t20 9.5q5 -1 7 0t2 4.5v7.5t1 8.5t3 7.5q4 6 16 10.5t14 5.5l19 12q4 4 0 4q18 -2 32 11q13 12 -5 23q2 7 -4 10.5t-16 5.5q3 1 12 0.5t12 1.5q15 11 -7 17q-20 5 -47 -13q-3 -2 -13 -12t-17 -11q15 18 5 22q8 -1 22.5 9t15.5 11 q4 2 10.5 2.5t8.5 1.5q71 25 92 -1q8 11 11 15t9.5 9t15.5 8q21 7 23 9l1 23q-12 -1 -18 8t-7 22l-6 -8q0 6 -3.5 7.5t-7.5 0.5t-9.5 -2t-7.5 0q-9 2 -19.5 15.5t-14.5 16.5q9 0 9 5q-2 5 -10 8q1 6 -2 8t-9 0q-2 12 -1 13q-6 1 -11 11t-8 10q-2 0 -4.5 -2t-5 -5.5l-5 -7 t-3.5 -5.5l-2 -2q-12 6 -24 -10q-9 1 -17 -2q15 6 2 13q-11 5 -21 2q12 5 10 14t-12 16q1 0 4 -1t4 -1q-1 5 -9.5 9.5t-19.5 9t-14 6.5q-7 5 -36 10.5t-36 1.5q-5 -3 -6 -6t1.5 -8.5t3.5 -8.5q6 -23 5 -27q-1 -3 -8.5 -8t-5.5 -12q1 -4 11.5 -10t12.5 -12q5 -13 -4 -25 q-4 -5 -15 -11t-14 -10q-5 -5 -3.5 -11.5t0.5 -9.5q1 1 1 2.5t1 2.5q0 -13 11 -22q8 -6 -16 -18q-20 -11 -20 -4q1 8 -7.5 16t-10.5 12t-3.5 19t-9.5 21q-6 4 -19 4t-18 -5q0 10 -49 30q-17 8 -58 4q7 1 0 17q-8 16 -21 12q-8 25 -4 35q2 5 9 14t9 15q1 3 15.5 6t16.5 8 q1 4 -2.5 6.5t-9.5 4.5q53 -6 63 18q5 9 3 14q0 -1 2 -1t2 -1q12 3 7 17q19 8 26 8q5 -1 11 -6t10 -5q17 -3 21.5 10t-9.5 23q7 -4 7 6q-1 13 -7 19q-3 2 -6.5 2.5t-6.5 0t-7 0.5q-1 0 -8 2q-1 -1 -2 -1h-8q-4 -2 -4 -5v-1q-1 -3 4 -6l5 -1l3 -2q-1 0 -2.5 -2.5t-2.5 -2.5 q0 -3 3 -5q-2 -1 -14 -7.5t-17 -10.5q-1 -1 -4 -2.5t-4 -2.5q-2 -1 -4 2t-4 9t-4 11.5t-4.5 10t-5.5 4.5q-12 0 -18 -17q3 10 -13 17.5t-25 7.5q20 15 -9 30l-1 1q-30 -4 -45 -7q-2 -6 3 -12q-1 -7 6 -9q0 -1 0.5 -1t0.5 -1q0 1 -0.5 1t-0.5 1q3 -1 10.5 -1.5t9.5 -1.5 q3 -1 4.5 -2l7.5 -5t5.5 -6t-2.5 -5q-2 -1 -9 -4t-12.5 -5.5t-6.5 -3.5q-3 -5 0 -16t-2 -15q-5 5 -10 18.5t-8 17.5q8 -9 -30 -6l-8 1q-4 0 -15 -2t-16 -1q-7 0 -29 6q7 17 5 25q5 0 7 2l-6 3q-3 -1 -25 -9q2 -3 8 -9.5t9 -11.5q-22 6 -27 -2q0 -1 -9 0q-25 1 -24 -7 q1 -4 9 -12q0 -9 -1 -9q-27 22 -30 23q-172 -83 -276 -248q1 -2 2.5 -11t3.5 -8.5t11 4.5q9 -9 3 -21q2 2 36 -21q56 -40 22 -53v5.5t1 6.5q-9 -1 -19 5q-3 -6 0.5 -20t11.5 -14q-8 0 -10.5 -17t-2.5 -38.5t-1 -25.5l2 -1q-3 -13 6 -37.5t24 -20.5q-4 -18 5 -21q-1 -4 0 -8 t4.5 -8.5t6 -7l7.5 -7.5l6 -6q28 -11 41 -29q4 -6 10.5 -24.5t15.5 -25.5q-2 -6 10 -21.5t11 -25.5q-1 0 -2.5 -0.5t-2.5 -0.5q3 -8 16.5 -16t16.5 -14q2 -3 2.5 -10.5t3 -12t8.5 -2.5q3 24 -26 68q-16 27 -18 31q-3 5 -5.5 16.5t-4.5 15.5q27 -9 26 -13q-5 -10 26 -52 q2 -3 10 -10t11 -12q3 -4 9.5 -14.5t10.5 -15.5q-1 0 -3 -2l-3 -3q4 -2 9 -5t8 -4.5t7.5 -5t7.5 -7.5q16 -18 20 -33q1 -4 0.5 -15.5t1.5 -16.5q2 -6 6 -11t11.5 -10t11.5 -7t14.5 -6.5t11.5 -5.5q2 -1 18 -11t25 -14q10 -4 16.5 -4.5t16 2.5t15.5 4z" />
+<glyph unicode="&#xf0ac;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11 q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 10.5t-9.5 10.5q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5 q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5 q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5 t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-5 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3 q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25 q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5 t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 -2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5 t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10t17 -20q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21 q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5 q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3 q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5 t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q7 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5 q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7 q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />
 <glyph unicode="&#xf0ad;" horiz-adv-x="1664" d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5 t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
 <glyph unicode="&#xf0ae;" horiz-adv-x="1792" d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19 t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
 <glyph unicode="&#xf0b0;" horiz-adv-x="1408" d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
@@ -250,7 +250,7 @@
 <glyph unicode="&#xf0f3;" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1664 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5 q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" />
 <glyph unicode="&#xf0f4;" horiz-adv-x="1920" d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45 t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
 <glyph unicode="&#xf0f5;" horiz-adv-x="1408" d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45 t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f6;" horiz-adv-x="1280" d="M1024 352v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1024 608v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280z M768 896h299l-299 299v-299zM1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h544q40 0 88 -20t76 -48l408 -408q28 -28 48 -76t20 -88z" />
+<glyph unicode="&#xf0f6;" horiz-adv-x="1280" d="M1024 352v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1024 608v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280z M768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z" />
 <glyph unicode="&#xf0f7;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />
 <glyph unicode="&#xf0f8;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5 t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320 v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />
 <glyph unicode="&#xf0f9;" horiz-adv-x="1920" d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152 q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
@@ -277,7 +277,7 @@
 <glyph unicode="&#xf110;" horiz-adv-x="1568" d="M496 192q0 -60 -42.5 -102t-101.5 -42q-60 0 -102 42t-42 102t42 102t102 42q59 0 101.5 -42t42.5 -102zM928 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -66 -47 -113t-113 -47t-113 47t-47 113 t47 113t113 47t113 -47t47 -113zM1360 192q0 -46 -33 -79t-79 -33t-79 33t-33 79t33 79t79 33t79 -33t33 -79zM528 1088q0 -73 -51.5 -124.5t-124.5 -51.5t-124.5 51.5t-51.5 124.5t51.5 124.5t124.5 51.5t124.5 -51.5t51.5 -124.5zM992 1280q0 -80 -56 -136t-136 -56 t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1536 640q0 -40 -28 -68t-68 -28t-68 28t-28 68t28 68t68 28t68 -28t28 -68zM1328 1088q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5z" />
 <glyph unicode="&#xf111;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
 <glyph unicode="&#xf112;" horiz-adv-x="1792" d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19 l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
-<glyph unicode="&#xf113;" horiz-adv-x="1664" />
+<glyph unicode="&#xf113;" horiz-adv-x="1664" d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86 t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218 q0 -87 -27 -168q136 -160 136 -398z" />
 <glyph unicode="&#xf114;" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
 <glyph unicode="&#xf115;" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z " />
 <glyph unicode="&#xf116;" horiz-adv-x="1152" d="M896 608v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224h224q14 0 23 -9t9 -23zM1024 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 -28 t-28 -68v-704q0 -40 28 -68t68 -28h704q40 0 68 28t28 68zM1152 928v-704q0 -92 -65.5 -158t-158.5 -66h-704q-93 0 -158.5 66t-65.5 158v704q0 93 65.5 158.5t158.5 65.5h704q93 0 158.5 -65.5t65.5 -158.5z" />
@@ -317,8 +317,8 @@
 <glyph unicode="&#xf13a;" d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
 <glyph unicode="&#xf13b;" horiz-adv-x="1408" d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
 <glyph unicode="&#xf13c;" horiz-adv-x="1792" d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
-<glyph unicode="&#xf13d;" horiz-adv-x="1792" d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1790 276q-8 -20 -30 -20h-112q0 -137 -99.5 -251t-272 -179.5t-380.5 -65.5t-380.5 65.5t-272 179.5t-99.5 251h-112q-22 0 -30 20q-8 19 7 35l224 224q10 9 23 9q12 0 23 -9l224 -224 q15 -16 7 -35q-8 -20 -30 -20h-112q0 -85 112.5 -162.5t287.5 -100.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19t19 -45v-128 q0 -26 -19 -45t-45 -19h-192v-647q175 23 287.5 100.5t112.5 162.5h-112q-22 0 -30 20q-8 19 7 35l224 224q11 9 23 9t23 -9l224 -224q15 -16 7 -35z" />
-<glyph unicode="&#xf13e;" horiz-adv-x="1152" d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181 v-320h736zM703 169l-69 229q32 17 51 47t19 67q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5q0 -37 19 -67t51 -47l-69 -229q-5 -15 5 -28t26 -13h192q16 0 26 13t5 28z" />
+<glyph unicode="&#xf13d;" horiz-adv-x="1792" d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-13 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352 q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19 t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf13e;" horiz-adv-x="1152" d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181 v-320h736z" />
 <glyph unicode="&#xf140;" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150 t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
 <glyph unicode="&#xf141;" horiz-adv-x="1408" d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
 <glyph unicode="&#xf142;" horiz-adv-x="384" d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
@@ -333,7 +333,67 @@
 <glyph unicode="&#xf14b;" d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
 <glyph unicode="&#xf14c;" d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
 <glyph unicode="&#xf14d;" d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q10 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5 t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14e;" horiz-adv-x="1792" />
+<glyph unicode="&#xf14e;" d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf150;" d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf151;" d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf152;" d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf153;" horiz-adv-x="1024" d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9 t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26 l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" />
+<glyph unicode="&#xf154;" horiz-adv-x="1024" d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7 q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
+<glyph unicode="&#xf155;" horiz-adv-x="1024" d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43 t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5 t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50 t53 -63.5t31.5 -76.5t13 -94z" />
+<glyph unicode="&#xf156;" horiz-adv-x="898" d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102 q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf157;" horiz-adv-x="1027" d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61 l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
+<glyph unicode="&#xf158;" horiz-adv-x="1664" d="M1664 352v-32q0 -132 -94 -226t-226 -94h-128q-132 0 -226 94t-94 226v480h-224q-2 -102 -14.5 -190.5t-30.5 -156t-48.5 -126.5t-57 -99.5t-67.5 -77.5t-69.5 -58.5t-74 -44t-69 -32t-65.5 -25.5q-4 -2 -32 -13q-8 -2 -12 -2q-22 0 -30 20l-71 178q-5 13 0 25t17 17 q7 3 20 7.5t18 6.5q31 12 46.5 18.5t44.5 20t45.5 26t42 32.5t40.5 42.5t34.5 53.5t30.5 68.5t22.5 83.5t17 103t6.5 123h-256q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h1216q14 0 23 -9t9 -23v-160q0 -14 -9 -23t-23 -9h-224v-512q0 -26 19 -45t45 -19h128q26 0 45 19t19 45 v64q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1280 1376v-160q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h960q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf159;" horiz-adv-x="1792" d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23 t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28 q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf15a;" horiz-adv-x="1280" d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164 l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30 t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
+<glyph unicode="&#xf15b;" horiz-adv-x="1280" d="M1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" />
+<glyph unicode="&#xf15c;" horiz-adv-x="1280" d="M1024 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1024 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28 t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" />
+<glyph unicode="&#xf15d;" horiz-adv-x="1664" d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23 v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162 l230 -662h70z" />
+<glyph unicode="&#xf15e;" horiz-adv-x="1664" d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150 v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248 v119h121z" />
+<glyph unicode="&#xf160;" horiz-adv-x="1792" d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832 q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf161;" horiz-adv-x="1792" d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192 q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf162;" d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23 zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5 t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" />
+<glyph unicode="&#xf163;" d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9 t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13 q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" />
+<glyph unicode="&#xf164;" horiz-adv-x="1664" d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76 q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5 t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" />
+<glyph unicode="&#xf165;" horiz-adv-x="1664" d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135 t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121 t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" />
+<glyph unicode="&#xf166;" d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 16 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15 q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38 q21 -28 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5 q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78l24 -69t23 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38q-51 0 -78 -38 q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf167;" d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73 q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51 q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99 q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-37 -51 -106 -51q-67 0 -105 51 q-28 38 -28 118v175q0 80 28 117q38 51 105 51q69 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" />
+<glyph unicode="&#xf168;" horiz-adv-x="1408" d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942 q25 45 64 45h241q22 0 31 -15z" />
+<glyph unicode="&#xf169;" d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1 l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf16a;" horiz-adv-x="1792" d="M1280 640q0 37 -30 54l-512 320q-31 20 -65 2q-33 -18 -33 -56v-640q0 -38 33 -56q16 -8 31 -8q20 0 34 10l512 320q30 17 30 54zM1792 640q0 -96 -1 -150t-8.5 -136.5t-22.5 -147.5q-16 -73 -69 -123t-124 -58q-222 -25 -671 -25t-671 25q-71 8 -124.5 58t-69.5 123 q-14 65 -21.5 147.5t-8.5 136.5t-1 150t1 150t8.5 136.5t22.5 147.5q16 73 69 123t124 58q222 25 671 25t671 -25q71 -8 124.5 -58t69.5 -123q14 -65 21.5 -147.5t8.5 -136.5t1 -150z" />
+<glyph unicode="&#xf16b;" horiz-adv-x="1792" d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
+<glyph unicode="&#xf16c;" horiz-adv-x="1408" d="M928 135v-151l-707 -1v151zM1169 481v-701l-1 -35v-1h-1132l-35 1h-1v736h121v-618h928v618h120zM241 393l704 -65l-13 -150l-705 65zM309 709l683 -183l-39 -146l-683 183zM472 1058l609 -360l-77 -130l-609 360zM832 1389l398 -585l-124 -85l-399 584zM1285 1536 l121 -697l-149 -26l-121 697z" />
+<glyph unicode="&#xf16d;" d="M1362 110v648h-135q20 -63 20 -131q0 -126 -64 -232.5t-174 -168.5t-240 -62q-197 0 -337 135.5t-140 327.5q0 68 20 131h-141v-648q0 -26 17.5 -43.5t43.5 -17.5h1069q25 0 43 17.5t18 43.5zM1078 643q0 124 -90.5 211.5t-218.5 87.5q-127 0 -217.5 -87.5t-90.5 -211.5 t90.5 -211.5t217.5 -87.5q128 0 218.5 87.5t90.5 211.5zM1362 1003v165q0 28 -20 48.5t-49 20.5h-174q-29 0 -49 -20.5t-20 -48.5v-165q0 -29 20 -49t49 -20h174q29 0 49 20t20 49zM1536 1211v-1142q0 -81 -58 -139t-139 -58h-1142q-81 0 -139 58t-58 139v1142q0 81 58 139 t139 58h1142q81 0 139 -58t58 -139z" />
+<glyph unicode="&#xf16e;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150 t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
+<glyph unicode="&#xf170;" d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf171;" horiz-adv-x="1408" d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22 t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18 t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5 t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />
+<glyph unicode="&#xf172;" d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5 t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf173;" horiz-adv-x="1024" d="M390 1408h219v-388h364v-241h-364v-394q0 -136 14 -172q13 -37 52 -60q50 -31 117 -31q117 0 232 76v-242q-102 -48 -178 -65q-77 -19 -173 -19q-105 0 -186 27q-78 25 -138 75q-58 51 -79 105q-22 54 -22 161v539h-170v217q91 30 155 84q64 55 103 132q39 78 54 196z " />
+<glyph unicode="&#xf174;" d="M1123 127v181q-88 -56 -174 -56q-51 0 -88 23q-29 17 -39 45q-11 30 -11 129v295h274v181h-274v291h-164q-11 -90 -40 -147t-78 -99q-48 -40 -116 -63v-163h127v-404q0 -78 17 -121q17 -42 59 -78q43 -37 104 -57q62 -20 140 -20q67 0 129 14q57 13 134 49zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf175;" horiz-adv-x="768" d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
+<glyph unicode="&#xf176;" horiz-adv-x="768" d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
+<glyph unicode="&#xf177;" horiz-adv-x="1792" d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf178;" horiz-adv-x="1792" d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
+<glyph unicode="&#xf179;" horiz-adv-x="1408" d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q112 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65 q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" />
+<glyph unicode="&#xf17a;" horiz-adv-x="1664" d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
+<glyph unicode="&#xf17b;" horiz-adv-x="1408" d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30 t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5 h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" />
+<glyph unicode="&#xf17c;" d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-7 -10 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7 q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15 q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5 t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19 q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63 q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18l-4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92 q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 37 34.5 53t72.5 10.5t60 -22.5zM626 1152 q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-14 -1 -7 -7l4 -2 q14 -4 18 -31q0 -3 8 2zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5t-30 -18.5 t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43q-19 4 -51 9.5 t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 -6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49t-14 -48 q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54q110 143 124 195 q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5t-40.5 -33.5t-61 -14 q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5t15.5 47.5q1 -31 8 -56.5 t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
+<glyph unicode="&#xf17d;" d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81 t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19 q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -6 6.5 -17.5t7.5 -16.5q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6 t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf17e;" d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5 t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5 q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80 q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />
+<glyph unicode="&#xf180;" horiz-adv-x="1664" d="M1483 512l-587 -587q-52 -53 -127.5 -53t-128.5 53l-587 587q-53 53 -53 128t53 128l587 587q53 53 128 53t128 -53l265 -265l-398 -399l-188 188q-42 42 -99 42q-59 0 -100 -41l-120 -121q-42 -40 -42 -99q0 -58 42 -100l406 -408q30 -28 67 -37l6 -4h28q60 0 99 41 l619 619l2 -3q53 -53 53 -128t-53 -128zM1406 1138l120 -120q14 -15 14 -36t-14 -36l-730 -730q-17 -15 -37 -15v0q-4 0 -6 1q-18 2 -30 14l-407 408q-14 15 -14 36t14 35l121 120q13 15 35 15t36 -15l252 -252l574 575q15 15 36 15t36 -15z" />
+<glyph unicode="&#xf181;" d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408 q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf182;" horiz-adv-x="1280" d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43 q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
+<glyph unicode="&#xf183;" horiz-adv-x="1024" d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
+<glyph unicode="&#xf184;" d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf185;" horiz-adv-x="1792" d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4 l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94 q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" />
+<glyph unicode="&#xf186;" d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61 t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
+<glyph unicode="&#xf187;" horiz-adv-x="1792" d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536 q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf188;" horiz-adv-x="1664" d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207 q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19 t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
+<glyph unicode="&#xf189;" horiz-adv-x="1920" d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-78 -100 -90 -131q-17 -41 14 -81q17 -21 81 -82h1l1 -1l1 -1l2 -2q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58 t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6 q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q17 19 38 30q53 26 239 24 q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2 q39 5 64 -2.5t31 -16.5z" />
+<glyph unicode="&#xf18a;" horiz-adv-x="1792" d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12 q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422 q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178 q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
+<glyph unicode="&#xf18b;" horiz-adv-x="1920" d="M805 163q-122 -67 -261 -67q-141 0 -261 67q98 61 167 149t94 191q25 -103 94 -191t167 -149zM453 1176v-344q0 -179 -89.5 -326t-234.5 -217q-129 152 -129 351q0 200 129.5 352t323.5 184zM958 991q-128 -152 -128 -351q0 -201 128 -351q-145 70 -234.5 218t-89.5 328 v341q196 -33 324 -185zM1638 163q-122 -67 -261 -67q-141 0 -261 67q98 61 167 149t94 191q25 -103 94 -191t167 -149zM1286 1176v-344q0 -179 -91 -326t-237 -217v0q133 154 133 351q0 195 -133 351q129 151 328 185zM1920 640q0 -201 -129 -351q-145 70 -234.5 218 t-89.5 328v341q194 -32 323.5 -184t129.5 -352z" />
+<glyph unicode="&#xf18c;" horiz-adv-x="1792" />
+<glyph unicode="&#xf18d;" horiz-adv-x="1792" />
+<glyph unicode="&#xf18e;" horiz-adv-x="1792" />
 <glyph unicode="&#xf500;" horiz-adv-x="1792" />
 </font>
 </defs></svg> 
\ No newline at end of file
diff --git a/shared/vendor/css/font-awesome/font/fontawesome-webfont.ttf b/shared/vendor/css/font-awesome/font/fontawesome-webfont.ttf
index 908f69ec9a7..d3659246915 100755
Binary files a/shared/vendor/css/font-awesome/font/fontawesome-webfont.ttf and b/shared/vendor/css/font-awesome/font/fontawesome-webfont.ttf differ
diff --git a/shared/vendor/css/font-awesome/font/fontawesome-webfont.woff b/shared/vendor/css/font-awesome/font/fontawesome-webfont.woff
index a33af950aed..b9bd17e158d 100755
Binary files a/shared/vendor/css/font-awesome/font/fontawesome-webfont.woff and b/shared/vendor/css/font-awesome/font/fontawesome-webfont.woff differ
diff --git a/shared/vendor/css/jquery.spectrum.css b/shared/vendor/css/jquery.spectrum.css
index abc65259743..cf0199ff5d0 100644
--- a/shared/vendor/css/jquery.spectrum.css
+++ b/shared/vendor/css/jquery.spectrum.css
@@ -1,5 +1,5 @@
 /***
-Spectrum Colorpicker v1.0.9
+Spectrum Colorpicker v1.3.0
 https://github.com/bgrins/spectrum
 Author: Brian Grinstead
 License: MIT
@@ -12,13 +12,22 @@ License: MIT
     display:inline-block;
     *display: inline;
     *zoom: 1;
-    z-index: 2147483647;
+    /* https://github.com/bgrins/spectrum/issues/40 */
+    z-index: 9999994;
     overflow: hidden;
 }
 .sp-container.sp-flat {
     position: relative;
 }
 
+/* Fix for * { box-sizing: border-box; } */
+.sp-container,
+.sp-container * {
+    -webkit-box-sizing: content-box;
+       -moz-box-sizing: content-box;
+            box-sizing: content-box;
+}
+
 /* http://ansciath.tumblr.com/post/7347495869/css-aspect-ratio */
 .sp-top {
   position:relative;
@@ -47,6 +56,12 @@ License: MIT
     left:84%;
     height: 100%;
 }
+
+.sp-clear-enabled .sp-hue {
+    top:33px;
+    height: 77.5%;
+}
+
 .sp-fill {
     padding-top: 80%;
 }
@@ -58,17 +73,13 @@ License: MIT
     bottom:0;
 }
 
-.sp-alpha-enabled .sp-top
-{
+.sp-alpha-enabled .sp-top {
     margin-bottom: 18px;
 }
-.sp-alpha-enabled .sp-alpha
-{
+.sp-alpha-enabled .sp-alpha {
     display: block;
 }
-
-.sp-alpha-handle
-{
+.sp-alpha-handle {
     position:absolute;
     top:-4px;
     bottom: -4px;
@@ -79,9 +90,7 @@ License: MIT
     background: white;
     opacity: .8;
 }
-
-.sp-alpha
-{
+.sp-alpha {
     display: none;
     position: absolute;
     bottom: -14px;
@@ -89,12 +98,30 @@ License: MIT
     left: 0;
     height: 8px;
 }
-.sp-alpha-inner{
+.sp-alpha-inner {
     border: solid 1px #333;
 }
 
+.sp-clear {
+    display: none;
+}
+
+.sp-clear.sp-clear-display {
+    background-position: center;
+}
+
+.sp-clear-enabled .sp-clear {
+    display: block;
+    position:absolute;
+    top:0px;
+    right:0;
+    bottom:0;
+    left:84%;
+    height: 28px;
+}
+
 /* Don't allow text selection */
-.sp-container, .sp-replacer, .sp-preview, .sp-dragger, .sp-slider, .sp-alpha, .sp-alpha-handle, .sp-container.sp-dragging .sp-input, .sp-container button  {
+.sp-container, .sp-replacer, .sp-preview, .sp-dragger, .sp-slider, .sp-alpha, .sp-clear, .sp-alpha-handle, .sp-container.sp-dragging .sp-input, .sp-container button  {
     -webkit-user-select:none;
     -moz-user-select: -moz-none;
     -o-user-select:none;
@@ -153,7 +180,6 @@ License: MIT
    Generate 6 divs, line them up, and do two color gradients for each.
    Yes, really.
  */
-
 .sp-1 {
     height:17%;
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0000', endColorstr='#ffff00');
@@ -194,7 +220,6 @@ License: MIT
     .sp-hue { left: 63%; }
     .sp-fill { padding-top: 60%; }
 }
-
 .sp-dragger {
    border-radius: 5px;
    height: 5px;
@@ -218,14 +243,19 @@ License: MIT
     opacity: .8;
 }
 
-/* Basic display options (colors, fonts, global widths) */
+/*
+Theme authors:
+Here are the basic themeable display options (colors, fonts, global widths).
+See http://bgrins.github.io/spectrum/themes/ for instructions.
+*/
+
 .sp-container {
     border-radius: 0;
     background-color: #ECECEC;
     border: solid 1px #f0c49B;
     padding: 0;
 }
-.sp-container, .sp-container button, .sp-container input, .sp-color, .sp-hue
+.sp-container, .sp-container button, .sp-container input, .sp-color, .sp-hue, .sp-clear
 {
     font: normal 12px "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
     -webkit-box-sizing: border-box;
@@ -237,7 +267,7 @@ License: MIT
 {
     margin-bottom: 3px;
 }
-.sp-color, .sp-hue
+.sp-color, .sp-hue, .sp-clear
 {
     border: solid 1px #666;
 }
@@ -322,6 +352,10 @@ License: MIT
     margin:0;
 }
 
+.sp-initial .sp-clear-display {
+    background-position: center;
+}
+
 /* Buttons */
 .sp-button-container {
     float: right;
@@ -394,7 +428,6 @@ License: MIT
   background-image: -moz-linear-gradient(top, #eeeeee, #cccccc);
   background-image: -ms-linear-gradient(top, #eeeeee, #cccccc);
   background-image: -o-linear-gradient(top, #eeeeee, #cccccc);
-  background-image: -ms-linear-gradient(top, #eeeeee, #cccccc);
   background-image: linear-gradient(to bottom, #eeeeee, #cccccc);
   border: 1px solid #ccc;
   border-bottom: 1px solid #bbb;
@@ -413,7 +446,6 @@ License: MIT
     background-image: -moz-linear-gradient(top, #dddddd, #bbbbbb);
     background-image: -ms-linear-gradient(top, #dddddd, #bbbbbb);
     background-image: -o-linear-gradient(top, #dddddd, #bbbbbb);
-    background-image: -ms-linear-gradient(top, #dddddd, #bbbbbb);
     background-image: linear-gradient(to bottom, #dddddd, #bbbbbb);
     border: 1px solid #bbb;
     border-bottom: 1px solid #999;
@@ -478,4 +510,10 @@ License: MIT
 .sp-palette .sp-thumb-dark.sp-thumb-active .sp-thumb-inner
 {
     background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAMdJREFUOE+tkgsNwzAMRMugEAahEAahEAZhEAqlEAZhEAohEAYh81X2dIm8fKpEspLGvudPOsUYpxE2BIJCroJmEW9qJ+MKaBFhEMNabSy9oIcIPwrB+afvAUFoK4H0tMaQ3XtlrggDhOVVMuT4E5MMG0FBbCEYzjYT7OxLEvIHQLY2zWwQ3D+9luyOQTfKDiFD3iUIfPk8VqrKjgAiSfGFPecrg6HN6m/iBcwiDAo7WiBeawa+Kwh7tZoSCGLMqwlSAzVDhoK+6vH4G0P5wdkAAAAASUVORK5CYII=);
-}
\ No newline at end of file
+}
+
+.sp-clear-display {
+    background-repeat:no-repeat;
+    background-position: center;
+    background-image: url(data:image/gif;base64,R0lGODlhFAAUAPcAAAAAAJmZmZ2dnZ6enqKioqOjo6SkpKWlpaampqenp6ioqKmpqaqqqqurq/Hx8fLy8vT09PX19ff39/j4+Pn5+fr6+vv7+wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAP8ALAAAAAAUABQAAAihAP9FoPCvoMGDBy08+EdhQAIJCCMybCDAAYUEARBAlFiQQoMABQhKUJBxY0SPICEYHBnggEmDKAuoPMjS5cGYMxHW3IiT478JJA8M/CjTZ0GgLRekNGpwAsYABHIypcAgQMsITDtWJYBR6NSqMico9cqR6tKfY7GeBCuVwlipDNmefAtTrkSzB1RaIAoXodsABiZAEFB06gIBWC1mLVgBa0AAOw==);
+}
diff --git a/shared/vendor/js/bootstrap-plugins/bootstrap.notify.js b/shared/vendor/js/bootstrap-plugins/bootstrap.notify.oae-edited.js
similarity index 68%
rename from shared/vendor/js/bootstrap-plugins/bootstrap.notify.js
rename to shared/vendor/js/bootstrap-plugins/bootstrap.notify.oae-edited.js
index 8e96a690fc3..f428c03949a 100644
--- a/shared/vendor/js/bootstrap-plugins/bootstrap.notify.js
+++ b/shared/vendor/js/bootstrap-plugins/bootstrap.notify.oae-edited.js
@@ -1,7 +1,6 @@
 /**
- * bootstrap-notify.js v1.0.0
+ * bootstrap-notify.js v1.0
  * --
- * Copyright 2012 Nijiko Yonskai <nijikokun@gmail.com>
  * Copyright 2012 Goodybag, Inc.
  * --
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,61 +16,65 @@
  * limitations under the License.
  */
 
-define(['jquery'], function (jQuery) {
 (function ($) {
   var Notification = function (element, options) {
     // Element collection
+    this.options  = $.extend(true, {}, $.fn.notify.defaults, options);
     this.$element = $(element);
     this.$note    = $('<div class="alert"></div>');
-    this.options  = $.extend(true, {}, $.fn.notify.defaults, options);
-    this._link    = null;
+    if (this.options.closable) {
+        this.$note.addClass('alert-dismissable');
+    }
 
     // Setup from options
-    if (this.options.transition)
-      if (this.options.transition === 'fade')
+    if(this.options.transition)
+      if(this.options.transition == 'fade')
         this.$note.addClass('in').addClass(this.options.transition);
       else this.$note.addClass(this.options.transition);
     else this.$note.addClass('fade').addClass('in');
 
-    if (this.options.type)
+    if(this.options.type)
       this.$note.addClass('alert-' + this.options.type);
     else this.$note.addClass('alert-success');
 
-    if (this.options.message)
-      if (typeof this.options.message === 'string')
-        this.$note.html(this.options.message);
-      else if (typeof this.options.message === 'object')
-        if (this.options.message.html)
+    if(!this.options.message && this.$element.data("message") !== '') // dom text
+      this.$note.html(this.$element.data("message"));
+    else
+      if(typeof this.options.message === 'object')
+        if(this.options.message.html)
           this.$note.html(this.options.message.html);
-        else if (this.options.message.text)
+        else if(this.options.message.text)
           this.$note.text(this.options.message.text);
+      else
+        this.$note.html(this.options.message);
 
-    if (this.options.closable)
-      this._link = $('<a class="close pull-right">&times;</a>'),
-      $(this._link).on('click', $.proxy(Notification.onClose, this)),
-      this.$note.prepend(this._link);
+    if(this.options.closable)
+      var link = $('<a class="close pull-right" href="#">&times;</a>');
+      $(link).on('click', $.proxy(onClose, this));
+      this.$note.prepend(link);
 
     return this;
   };
 
-  Notification.onClose = function () {
+  var onClose = function() {
     this.options.onClose();
     $(this.$note).remove();
     this.options.onClosed();
+    return false;
   };
 
   Notification.prototype.show = function () {
-    if (this.options.fadeOut.enabled)
-      this.$note.delay(this.options.fadeOut.delay || 3000).fadeOut('slow', $.proxy(Notification.onClose, this));
+    if(this.options.fadeOut.enabled)
+      this.$note.delay(this.options.fadeOut.delay || 3000).fadeOut('slow', $.proxy(onClose, this));
 
     this.$element.append(this.$note);
     this.$note.alert();
   };
 
   Notification.prototype.hide = function () {
-    if (this.options.fadeOut.enabled)
-      this.$note.delay(this.options.fadeOut.delay || 3000).fadeOut('slow', $.proxy(Notification.onClose, this));
-    else Notification.onClose.call(this);
+    if(this.options.fadeOut.enabled)
+      this.$note.delay(this.options.fadeOut.delay || 3000).fadeOut('slow', $.proxy(onClose, this));
+    else onClose.call(this);
   };
 
   $.fn.notify = function (options) {
@@ -91,4 +94,3 @@ define(['jquery'], function (jQuery) {
     onClosed: function () {}
   }
 })(window.jQuery);
-});
diff --git a/shared/vendor/js/bootstrap.js b/shared/vendor/js/bootstrap.js
old mode 100644
new mode 100755
index c298ee42e30..850e6e53b4b
--- a/shared/vendor/js/bootstrap.js
+++ b/shared/vendor/js/bootstrap.js
@@ -1,8 +1,16 @@
-/* ===================================================
- * bootstrap-transition.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#transitions
- * ===================================================
- * Copyright 2012 Twitter, Inc.
+/*!
+ * Bootstrap v3.0.3 (http://getbootstrap.com)
+ * Copyright 2013 Twitter, Inc.
+ * Licensed under http://www.apache.org/licenses/LICENSE-2.0
+ */
+
+if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") }
+
+/* ========================================================================
+ * Bootstrap: transition.js v3.0.3
+ * http://getbootstrap.com/javascript/#transitions
+ * ========================================================================
+ * Copyright 2013 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,53 +23,51 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ========================================================== */
+ * ======================================================================== */
 
 
-!function ($) {
++function ($) { "use strict";
 
-  "use strict"; // jshint ;_;
+  // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
+  // ============================================================
 
+  function transitionEnd() {
+    var el = document.createElement('bootstrap')
 
-  /* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
-   * ======================================================= */
-
-  $(function () {
-
-    $.support.transition = (function () {
-
-      var transitionEnd = (function () {
-
-        var el = document.createElement('bootstrap')
-          , transEndEventNames = {
-               'WebkitTransition' : 'webkitTransitionEnd'
-            ,  'MozTransition'    : 'transitionend'
-            ,  'OTransition'      : 'oTransitionEnd otransitionend'
-            ,  'transition'       : 'transitionend'
-            }
-          , name
-
-        for (name in transEndEventNames){
-          if (el.style[name] !== undefined) {
-            return transEndEventNames[name]
-          }
-        }
-
-      }())
+    var transEndEventNames = {
+      'WebkitTransition' : 'webkitTransitionEnd'
+    , 'MozTransition'    : 'transitionend'
+    , 'OTransition'      : 'oTransitionEnd otransitionend'
+    , 'transition'       : 'transitionend'
+    }
 
-      return transitionEnd && {
-        end: transitionEnd
+    for (var name in transEndEventNames) {
+      if (el.style[name] !== undefined) {
+        return { end: transEndEventNames[name] }
       }
+    }
+  }
 
-    })()
+  // http://blog.alexmaccaw.com/css-transitions
+  $.fn.emulateTransitionEnd = function (duration) {
+    var called = false, $el = this
+    $(this).one($.support.transition.end, function () { called = true })
+    var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
+    setTimeout(callback, duration)
+    return this
+  }
 
+  $(function () {
+    $.support.transition = transitionEnd()
   })
 
-}(window.jQuery);/* ==========================================================
- * bootstrap-alert.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#alerts
- * ==========================================================
- * Copyright 2012 Twitter, Inc.
+}(jQuery);
+
+/* ========================================================================
+ * Bootstrap: alert.js v3.0.3
+ * http://getbootstrap.com/javascript/#alerts
+ * ========================================================================
+ * Copyright 2013 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -74,66 +80,65 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ========================================================== */
-
+ * ======================================================================== */
 
-!function ($) {
 
-  "use strict"; // jshint ;_;
++function ($) { "use strict";
 
-
- /* ALERT CLASS DEFINITION
-  * ====================== */
+  // ALERT CLASS DEFINITION
+  // ======================
 
   var dismiss = '[data-dismiss="alert"]'
-    , Alert = function (el) {
-        $(el).on('click', dismiss, this.close)
-      }
+  var Alert   = function (el) {
+    $(el).on('click', dismiss, this.close)
+  }
 
   Alert.prototype.close = function (e) {
-    var $this = $(this)
-      , selector = $this.attr('data-target')
-      , $parent
+    var $this    = $(this)
+    var selector = $this.attr('data-target')
 
     if (!selector) {
       selector = $this.attr('href')
-      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
     }
 
-    $parent = $(selector)
+    var $parent = $(selector)
 
-    e && e.preventDefault()
+    if (e) e.preventDefault()
 
-    $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
+    if (!$parent.length) {
+      $parent = $this.hasClass('alert') ? $this : $this.parent()
+    }
 
-    $parent.trigger(e = $.Event('close'))
+    $parent.trigger(e = $.Event('close.bs.alert'))
 
     if (e.isDefaultPrevented()) return
 
     $parent.removeClass('in')
 
     function removeElement() {
-      $parent
-        .trigger('closed')
-        .remove()
+      $parent.trigger('closed.bs.alert').remove()
     }
 
     $.support.transition && $parent.hasClass('fade') ?
-      $parent.on($.support.transition.end, removeElement) :
+      $parent
+        .one($.support.transition.end, removeElement)
+        .emulateTransitionEnd(150) :
       removeElement()
   }
 
 
- /* ALERT PLUGIN DEFINITION
-  * ======================= */
+  // ALERT PLUGIN DEFINITION
+  // =======================
 
   var old = $.fn.alert
 
   $.fn.alert = function (option) {
     return this.each(function () {
       var $this = $(this)
-        , data = $this.data('alert')
-      if (!data) $this.data('alert', (data = new Alert(this)))
+      var data  = $this.data('bs.alert')
+
+      if (!data) $this.data('bs.alert', (data = new Alert(this)))
       if (typeof option == 'string') data[option].call($this)
     })
   }
@@ -141,8 +146,8 @@
   $.fn.alert.Constructor = Alert
 
 
- /* ALERT NO CONFLICT
-  * ================= */
+  // ALERT NO CONFLICT
+  // =================
 
   $.fn.alert.noConflict = function () {
     $.fn.alert = old
@@ -150,16 +155,18 @@
   }
 
 
- /* ALERT DATA-API
-  * ============== */
+  // ALERT DATA-API
+  // ==============
 
-  $(document).on('click.alert.data-api', dismiss, Alert.prototype.close)
+  $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
 
-}(window.jQuery);/* ============================================================
- * bootstrap-button.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#buttons
- * ============================================================
- * Copyright 2012 Twitter, Inc.
+}(jQuery);
+
+/* ========================================================================
+ * Bootstrap: button.js v3.0.3
+ * http://getbootstrap.com/javascript/#buttons
+ * ========================================================================
+ * Copyright 2013 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -172,30 +179,32 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ============================================================ */
-
+ * ======================================================================== */
 
-!function ($) {
 
-  "use strict"; // jshint ;_;
++function ($) { "use strict";
 
-
- /* BUTTON PUBLIC CLASS DEFINITION
-  * ============================== */
+  // BUTTON PUBLIC CLASS DEFINITION
+  // ==============================
 
   var Button = function (element, options) {
     this.$element = $(element)
-    this.options = $.extend({}, $.fn.button.defaults, options)
+    this.options  = $.extend({}, Button.DEFAULTS, options)
+  }
+
+  Button.DEFAULTS = {
+    loadingText: 'loading...'
   }
 
   Button.prototype.setState = function (state) {
-    var d = 'disabled'
-      , $el = this.$element
-      , data = $el.data()
-      , val = $el.is('input') ? 'val' : 'html'
+    var d    = 'disabled'
+    var $el  = this.$element
+    var val  = $el.is('input') ? 'val' : 'html'
+    var data = $el.data()
 
     state = state + 'Text'
-    data.resetText || $el.data('resetText', $el[val]())
+
+    if (!data.resetText) $el.data('resetText', $el[val]())
 
     $el[val](data[state] || this.options[state])
 
@@ -203,46 +212,53 @@
     setTimeout(function () {
       state == 'loadingText' ?
         $el.addClass(d).attr(d, d) :
-        $el.removeClass(d).removeAttr(d)
+        $el.removeClass(d).removeAttr(d);
     }, 0)
   }
 
   Button.prototype.toggle = function () {
-    var $parent = this.$element.closest('[data-toggle="buttons-radio"]')
-
-    $parent && $parent
-      .find('.active')
-      .removeClass('active')
+    var $parent = this.$element.closest('[data-toggle="buttons"]')
+    var changed = true
+
+    if ($parent.length) {
+      var $input = this.$element.find('input')
+      if ($input.prop('type') === 'radio') {
+        // see if clicking on current one
+        if ($input.prop('checked') && this.$element.hasClass('active'))
+          changed = false
+        else
+          $parent.find('.active').removeClass('active')
+      }
+      if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change')
+    }
 
-    this.$element.toggleClass('active')
+    if (changed) this.$element.toggleClass('active')
   }
 
 
- /* BUTTON PLUGIN DEFINITION
-  * ======================== */
+  // BUTTON PLUGIN DEFINITION
+  // ========================
 
   var old = $.fn.button
 
   $.fn.button = function (option) {
     return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('button')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('button', (data = new Button(this, options)))
+      var $this   = $(this)
+      var data    = $this.data('bs.button')
+      var options = typeof option == 'object' && option
+
+      if (!data) $this.data('bs.button', (data = new Button(this, options)))
+
       if (option == 'toggle') data.toggle()
       else if (option) data.setState(option)
     })
   }
 
-  $.fn.button.defaults = {
-    loadingText: 'loading...'
-  }
-
   $.fn.button.Constructor = Button
 
 
- /* BUTTON NO CONFLICT
-  * ================== */
+  // BUTTON NO CONFLICT
+  // ==================
 
   $.fn.button.noConflict = function () {
     $.fn.button = old
@@ -250,20 +266,23 @@
   }
 
 
- /* BUTTON DATA-API
-  * =============== */
+  // BUTTON DATA-API
+  // ===============
 
-  $(document).on('click.button.data-api', '[data-toggle^=button]', function (e) {
+  $(document).on('click.bs.button.data-api', '[data-toggle^=button]', function (e) {
     var $btn = $(e.target)
     if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
     $btn.button('toggle')
+    e.preventDefault()
   })
 
-}(window.jQuery);/* ==========================================================
- * bootstrap-carousel.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#carousel
- * ==========================================================
- * Copyright 2012 Twitter, Inc.
+}(jQuery);
+
+/* ========================================================================
+ * Bootstrap: carousel.js v3.0.3
+ * http://getbootstrap.com/javascript/#carousel
+ * ========================================================================
+ * Copyright 2013 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -276,200 +295,212 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ========================================================== */
-
+ * ======================================================================== */
 
-!function ($) {
 
-  "use strict"; // jshint ;_;
++function ($) { "use strict";
 
-
- /* CAROUSEL CLASS DEFINITION
-  * ========================= */
+  // CAROUSEL CLASS DEFINITION
+  // =========================
 
   var Carousel = function (element, options) {
-    this.$element = $(element)
+    this.$element    = $(element)
     this.$indicators = this.$element.find('.carousel-indicators')
-    this.options = options
+    this.options     = options
+    this.paused      =
+    this.sliding     =
+    this.interval    =
+    this.$active     =
+    this.$items      = null
+
     this.options.pause == 'hover' && this.$element
       .on('mouseenter', $.proxy(this.pause, this))
       .on('mouseleave', $.proxy(this.cycle, this))
   }
 
-  Carousel.prototype = {
+  Carousel.DEFAULTS = {
+    interval: 5000
+  , pause: 'hover'
+  , wrap: true
+  }
 
-    cycle: function (e) {
-      if (!e) this.paused = false
-      if (this.interval) clearInterval(this.interval);
-      this.options.interval
-        && !this.paused
-        && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
-      return this
-    }
+  Carousel.prototype.cycle =  function (e) {
+    e || (this.paused = false)
 
-  , getActiveIndex: function () {
-      this.$active = this.$element.find('.item.active')
-      this.$items = this.$active.parent().children()
-      return this.$items.index(this.$active)
-    }
+    this.interval && clearInterval(this.interval)
 
-  , to: function (pos) {
-      var activeIndex = this.getActiveIndex()
-        , that = this
+    this.options.interval
+      && !this.paused
+      && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
 
-      if (pos > (this.$items.length - 1) || pos < 0) return
+    return this
+  }
 
-      if (this.sliding) {
-        return this.$element.one('slid', function () {
-          that.to(pos)
-        })
-      }
+  Carousel.prototype.getActiveIndex = function () {
+    this.$active = this.$element.find('.item.active')
+    this.$items  = this.$active.parent().children()
 
-      if (activeIndex == pos) {
-        return this.pause().cycle()
-      }
+    return this.$items.index(this.$active)
+  }
 
-      return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
-    }
+  Carousel.prototype.to = function (pos) {
+    var that        = this
+    var activeIndex = this.getActiveIndex()
 
-  , pause: function (e) {
-      if (!e) this.paused = true
-      if (this.$element.find('.next, .prev').length && $.support.transition.end) {
-        this.$element.trigger($.support.transition.end)
-        this.cycle(true)
-      }
-      clearInterval(this.interval)
-      this.interval = null
-      return this
-    }
+    if (pos > (this.$items.length - 1) || pos < 0) return
 
-  , next: function () {
-      if (this.sliding) return
-      return this.slide('next')
-    }
+    if (this.sliding)       return this.$element.one('slid.bs.carousel', function () { that.to(pos) })
+    if (activeIndex == pos) return this.pause().cycle()
 
-  , prev: function () {
-      if (this.sliding) return
-      return this.slide('prev')
+    return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
+  }
+
+  Carousel.prototype.pause = function (e) {
+    e || (this.paused = true)
+
+    if (this.$element.find('.next, .prev').length && $.support.transition.end) {
+      this.$element.trigger($.support.transition.end)
+      this.cycle(true)
     }
 
-  , slide: function (type, next) {
-      var $active = this.$element.find('.item.active')
-        , $next = next || $active[type]()
-        , isCycling = this.interval
-        , direction = type == 'next' ? 'left' : 'right'
-        , fallback  = type == 'next' ? 'first' : 'last'
-        , that = this
-        , e
+    this.interval = clearInterval(this.interval)
 
-      this.sliding = true
+    return this
+  }
 
-      isCycling && this.pause()
+  Carousel.prototype.next = function () {
+    if (this.sliding) return
+    return this.slide('next')
+  }
 
-      $next = $next.length ? $next : this.$element.find('.item')[fallback]()
+  Carousel.prototype.prev = function () {
+    if (this.sliding) return
+    return this.slide('prev')
+  }
 
-      e = $.Event('slide', {
-        relatedTarget: $next[0]
-      , direction: direction
-      })
+  Carousel.prototype.slide = function (type, next) {
+    var $active   = this.$element.find('.item.active')
+    var $next     = next || $active[type]()
+    var isCycling = this.interval
+    var direction = type == 'next' ? 'left' : 'right'
+    var fallback  = type == 'next' ? 'first' : 'last'
+    var that      = this
 
-      if ($next.hasClass('active')) return
+    if (!$next.length) {
+      if (!this.options.wrap) return
+      $next = this.$element.find('.item')[fallback]()
+    }
 
-      if (this.$indicators.length) {
-        this.$indicators.find('.active').removeClass('active')
-        this.$element.one('slid', function () {
-          var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
-          $nextIndicator && $nextIndicator.addClass('active')
-        })
-      }
+    this.sliding = true
+
+    isCycling && this.pause()
+
+    var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction })
+
+    if ($next.hasClass('active')) return
+
+    if (this.$indicators.length) {
+      this.$indicators.find('.active').removeClass('active')
+      this.$element.one('slid.bs.carousel', function () {
+        var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
+        $nextIndicator && $nextIndicator.addClass('active')
+      })
+    }
 
-      if ($.support.transition && this.$element.hasClass('slide')) {
-        this.$element.trigger(e)
-        if (e.isDefaultPrevented()) return
-        $next.addClass(type)
-        $next[0].offsetWidth // force reflow
-        $active.addClass(direction)
-        $next.addClass(direction)
-        this.$element.one($.support.transition.end, function () {
+    if ($.support.transition && this.$element.hasClass('slide')) {
+      this.$element.trigger(e)
+      if (e.isDefaultPrevented()) return
+      $next.addClass(type)
+      $next[0].offsetWidth // force reflow
+      $active.addClass(direction)
+      $next.addClass(direction)
+      $active
+        .one($.support.transition.end, function () {
           $next.removeClass([type, direction].join(' ')).addClass('active')
           $active.removeClass(['active', direction].join(' '))
           that.sliding = false
-          setTimeout(function () { that.$element.trigger('slid') }, 0)
+          setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0)
         })
-      } else {
-        this.$element.trigger(e)
-        if (e.isDefaultPrevented()) return
-        $active.removeClass('active')
-        $next.addClass('active')
-        this.sliding = false
-        this.$element.trigger('slid')
-      }
-
-      isCycling && this.cycle()
-
-      return this
+        .emulateTransitionEnd(600)
+    } else {
+      this.$element.trigger(e)
+      if (e.isDefaultPrevented()) return
+      $active.removeClass('active')
+      $next.addClass('active')
+      this.sliding = false
+      this.$element.trigger('slid.bs.carousel')
     }
 
+    isCycling && this.cycle()
+
+    return this
   }
 
 
- /* CAROUSEL PLUGIN DEFINITION
-  * ========================== */
+  // CAROUSEL PLUGIN DEFINITION
+  // ==========================
 
   var old = $.fn.carousel
 
   $.fn.carousel = function (option) {
     return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('carousel')
-        , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option)
-        , action = typeof option == 'string' ? option : options.slide
-      if (!data) $this.data('carousel', (data = new Carousel(this, options)))
+      var $this   = $(this)
+      var data    = $this.data('bs.carousel')
+      var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option)
+      var action  = typeof option == 'string' ? option : options.slide
+
+      if (!data) $this.data('bs.carousel', (data = new Carousel(this, options)))
       if (typeof option == 'number') data.to(option)
       else if (action) data[action]()
       else if (options.interval) data.pause().cycle()
     })
   }
 
-  $.fn.carousel.defaults = {
-    interval: 5000
-  , pause: 'hover'
-  }
-
   $.fn.carousel.Constructor = Carousel
 
 
- /* CAROUSEL NO CONFLICT
-  * ==================== */
+  // CAROUSEL NO CONFLICT
+  // ====================
 
   $.fn.carousel.noConflict = function () {
     $.fn.carousel = old
     return this
   }
 
- /* CAROUSEL DATA-API
-  * ================= */
 
-  $(document).on('click.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
-    var $this = $(this), href
-      , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
-      , options = $.extend({}, $target.data(), $this.data())
-      , slideIndex
+  // CAROUSEL DATA-API
+  // =================
+
+  $(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
+    var $this   = $(this), href
+    var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+    var options = $.extend({}, $target.data(), $this.data())
+    var slideIndex = $this.attr('data-slide-to')
+    if (slideIndex) options.interval = false
 
     $target.carousel(options)
 
     if (slideIndex = $this.attr('data-slide-to')) {
-      $target.data('carousel').pause().to(slideIndex).cycle()
+      $target.data('bs.carousel').to(slideIndex)
     }
 
     e.preventDefault()
   })
 
-}(window.jQuery);/* =============================================================
- * bootstrap-collapse.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#collapse
- * =============================================================
- * Copyright 2012 Twitter, Inc.
+  $(window).on('load', function () {
+    $('[data-ride="carousel"]').each(function () {
+      var $carousel = $(this)
+      $carousel.carousel($carousel.data())
+    })
+  })
+
+}(jQuery);
+
+/* ========================================================================
+ * Bootstrap: collapse.js v3.0.3
+ * http://getbootstrap.com/javascript/#collapse
+ * ========================================================================
+ * Copyright 2013 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -482,135 +513,138 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ============================================================ */
-
+ * ======================================================================== */
 
-!function ($) {
 
-  "use strict"; // jshint ;_;
++function ($) { "use strict";
 
-
- /* COLLAPSE PUBLIC CLASS DEFINITION
-  * ================================ */
+  // COLLAPSE PUBLIC CLASS DEFINITION
+  // ================================
 
   var Collapse = function (element, options) {
-    this.$element = $(element)
-    this.options = $.extend({}, $.fn.collapse.defaults, options)
+    this.$element      = $(element)
+    this.options       = $.extend({}, Collapse.DEFAULTS, options)
+    this.transitioning = null
 
-    if (this.options.parent) {
-      this.$parent = $(this.options.parent)
-    }
+    if (this.options.parent) this.$parent = $(this.options.parent)
+    if (this.options.toggle) this.toggle()
+  }
 
-    this.options.toggle && this.toggle()
+  Collapse.DEFAULTS = {
+    toggle: true
   }
 
-  Collapse.prototype = {
+  Collapse.prototype.dimension = function () {
+    var hasWidth = this.$element.hasClass('width')
+    return hasWidth ? 'width' : 'height'
+  }
 
-    constructor: Collapse
+  Collapse.prototype.show = function () {
+    if (this.transitioning || this.$element.hasClass('in')) return
 
-  , dimension: function () {
-      var hasWidth = this.$element.hasClass('width')
-      return hasWidth ? 'width' : 'height'
-    }
+    var startEvent = $.Event('show.bs.collapse')
+    this.$element.trigger(startEvent)
+    if (startEvent.isDefaultPrevented()) return
 
-  , show: function () {
-      var dimension
-        , scroll
-        , actives
-        , hasData
+    var actives = this.$parent && this.$parent.find('> .panel > .in')
 
-      if (this.transitioning || this.$element.hasClass('in')) return
+    if (actives && actives.length) {
+      var hasData = actives.data('bs.collapse')
+      if (hasData && hasData.transitioning) return
+      actives.collapse('hide')
+      hasData || actives.data('bs.collapse', null)
+    }
 
-      dimension = this.dimension()
-      scroll = $.camelCase(['scroll', dimension].join('-'))
-      actives = this.$parent && this.$parent.find('> .accordion-group > .in')
+    var dimension = this.dimension()
 
-      if (actives && actives.length) {
-        hasData = actives.data('collapse')
-        if (hasData && hasData.transitioning) return
-        actives.collapse('hide')
-        hasData || actives.data('collapse', null)
-      }
+    this.$element
+      .removeClass('collapse')
+      .addClass('collapsing')
+      [dimension](0)
 
-      this.$element[dimension](0)
-      this.transition('addClass', $.Event('show'), 'shown')
-      $.support.transition && this.$element[dimension](this.$element[0][scroll])
-    }
+    this.transitioning = 1
 
-  , hide: function () {
-      var dimension
-      if (this.transitioning || !this.$element.hasClass('in')) return
-      dimension = this.dimension()
-      this.reset(this.$element[dimension]())
-      this.transition('removeClass', $.Event('hide'), 'hidden')
-      this.$element[dimension](0)
+    var complete = function () {
+      this.$element
+        .removeClass('collapsing')
+        .addClass('in')
+        [dimension]('auto')
+      this.transitioning = 0
+      this.$element.trigger('shown.bs.collapse')
     }
 
-  , reset: function (size) {
-      var dimension = this.dimension()
+    if (!$.support.transition) return complete.call(this)
 
-      this.$element
-        .removeClass('collapse')
-        [dimension](size || 'auto')
-        [0].offsetWidth
+    var scrollSize = $.camelCase(['scroll', dimension].join('-'))
 
-      this.$element[size !== null ? 'addClass' : 'removeClass']('collapse')
+    this.$element
+      .one($.support.transition.end, $.proxy(complete, this))
+      .emulateTransitionEnd(350)
+      [dimension](this.$element[0][scrollSize])
+  }
 
-      return this
-    }
+  Collapse.prototype.hide = function () {
+    if (this.transitioning || !this.$element.hasClass('in')) return
 
-  , transition: function (method, startEvent, completeEvent) {
-      var that = this
-        , complete = function () {
-            if (startEvent.type == 'show') that.reset()
-            that.transitioning = 0
-            that.$element.trigger(completeEvent)
-          }
+    var startEvent = $.Event('hide.bs.collapse')
+    this.$element.trigger(startEvent)
+    if (startEvent.isDefaultPrevented()) return
 
-      this.$element.trigger(startEvent)
+    var dimension = this.dimension()
 
-      if (startEvent.isDefaultPrevented()) return
+    this.$element
+      [dimension](this.$element[dimension]())
+      [0].offsetHeight
 
-      this.transitioning = 1
+    this.$element
+      .addClass('collapsing')
+      .removeClass('collapse')
+      .removeClass('in')
 
-      this.$element[method]('in')
+    this.transitioning = 1
 
-      $.support.transition && this.$element.hasClass('collapse') ?
-        this.$element.one($.support.transition.end, complete) :
-        complete()
+    var complete = function () {
+      this.transitioning = 0
+      this.$element
+        .trigger('hidden.bs.collapse')
+        .removeClass('collapsing')
+        .addClass('collapse')
     }
 
-  , toggle: function () {
-      this[this.$element.hasClass('in') ? 'hide' : 'show']()
-    }
+    if (!$.support.transition) return complete.call(this)
+
+    this.$element
+      [dimension](0)
+      .one($.support.transition.end, $.proxy(complete, this))
+      .emulateTransitionEnd(350)
+  }
 
+  Collapse.prototype.toggle = function () {
+    this[this.$element.hasClass('in') ? 'hide' : 'show']()
   }
 
 
- /* COLLAPSE PLUGIN DEFINITION
-  * ========================== */
+  // COLLAPSE PLUGIN DEFINITION
+  // ==========================
 
   var old = $.fn.collapse
 
   $.fn.collapse = function (option) {
     return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('collapse')
-        , options = $.extend({}, $.fn.collapse.defaults, $this.data(), typeof option == 'object' && option)
-      if (!data) $this.data('collapse', (data = new Collapse(this, options)))
+      var $this   = $(this)
+      var data    = $this.data('bs.collapse')
+      var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
+
+      if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
       if (typeof option == 'string') data[option]()
     })
   }
 
-  $.fn.collapse.defaults = {
-    toggle: true
-  }
-
   $.fn.collapse.Constructor = Collapse
 
 
- /* COLLAPSE NO CONFLICT
-  * ==================== */
+  // COLLAPSE NO CONFLICT
+  // ====================
 
   $.fn.collapse.noConflict = function () {
     $.fn.collapse = old
@@ -618,24 +652,35 @@
   }
 
 
- /* COLLAPSE DATA-API
-  * ================= */
+  // COLLAPSE DATA-API
+  // =================
 
-  $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) {
-    var $this = $(this), href
-      , target = $this.attr('data-target')
+  $(document).on('click.bs.collapse.data-api', '[data-toggle=collapse]', function (e) {
+    var $this   = $(this), href
+    var target  = $this.attr('data-target')
         || e.preventDefault()
         || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
-      , option = $(target).data('collapse') ? 'toggle' : $this.data()
-    $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
-    $(target).collapse(option)
+    var $target = $(target)
+    var data    = $target.data('bs.collapse')
+    var option  = data ? 'toggle' : $this.data()
+    var parent  = $this.attr('data-parent')
+    var $parent = parent && $(parent)
+
+    if (!data || !data.transitioning) {
+      if ($parent) $parent.find('[data-toggle=collapse][data-parent="' + parent + '"]').not($this).addClass('collapsed')
+      $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
+    }
+
+    $target.collapse(option)
   })
 
-}(window.jQuery);/* ============================================================
- * bootstrap-dropdown.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#dropdowns
- * ============================================================
- * Copyright 2012 Twitter, Inc.
+}(jQuery);
+
+/* ========================================================================
+ * Bootstrap: dropdown.js v3.0.3
+ * http://getbootstrap.com/javascript/#dropdowns
+ * ========================================================================
+ * Copyright 2013 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -648,127 +693,117 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ============================================================ */
+ * ======================================================================== */
 
 
-!function ($) {
++function ($) { "use strict";
 
-  "use strict"; // jshint ;_;
+  // DROPDOWN CLASS DEFINITION
+  // =========================
 
+  var backdrop = '.dropdown-backdrop'
+  var toggle   = '[data-toggle=dropdown]'
+  var Dropdown = function (element) {
+    $(element).on('click.bs.dropdown', this.toggle)
+  }
 
- /* DROPDOWN CLASS DEFINITION
-  * ========================= */
-
-  var toggle = '[data-toggle=dropdown]'
-    , Dropdown = function (element) {
-        var $el = $(element).on('click.dropdown.data-api', this.toggle)
-        $('html').on('click.dropdown.data-api', function () {
-          $el.parent().removeClass('open')
-        })
-      }
-
-  Dropdown.prototype = {
+  Dropdown.prototype.toggle = function (e) {
+    var $this = $(this)
 
-    constructor: Dropdown
+    if ($this.is('.disabled, :disabled')) return
 
-  , toggle: function (e) {
-      var $this = $(this)
-        , $parent
-        , isActive
+    var $parent  = getParent($this)
+    var isActive = $parent.hasClass('open')
 
-      if ($this.is('.disabled, :disabled')) return
+    clearMenus()
 
-      $parent = getParent($this)
+    if (!isActive) {
+      if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
+        // if mobile we use a backdrop because click events don't delegate
+        $('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
+      }
 
-      isActive = $parent.hasClass('open')
+      $parent.trigger(e = $.Event('show.bs.dropdown'))
 
-      clearMenus()
+      if (e.isDefaultPrevented()) return
 
-      if (!isActive) {
-        $parent.toggleClass('open')
-      }
+      $parent
+        .toggleClass('open')
+        .trigger('shown.bs.dropdown')
 
       $this.focus()
-
-      return false
     }
 
-  , keydown: function (e) {
-      var $this
-        , $items
-        , $active
-        , $parent
-        , isActive
-        , index
-
-      if (!/(38|40|27)/.test(e.keyCode)) return
-
-      $this = $(this)
+    return false
+  }
 
-      e.preventDefault()
-      e.stopPropagation()
+  Dropdown.prototype.keydown = function (e) {
+    if (!/(38|40|27)/.test(e.keyCode)) return
 
-      if ($this.is('.disabled, :disabled')) return
+    var $this = $(this)
 
-      $parent = getParent($this)
+    e.preventDefault()
+    e.stopPropagation()
 
-      isActive = $parent.hasClass('open')
+    if ($this.is('.disabled, :disabled')) return
 
-      if (!isActive || (isActive && e.keyCode == 27)) {
-        if (e.which == 27) $parent.find(toggle).focus()
-        return $this.click()
-      }
+    var $parent  = getParent($this)
+    var isActive = $parent.hasClass('open')
 
-      $items = $('[role=menu] li:not(.divider):visible a', $parent)
+    if (!isActive || (isActive && e.keyCode == 27)) {
+      if (e.which == 27) $parent.find(toggle).focus()
+      return $this.click()
+    }
 
-      if (!$items.length) return
+    var $items = $('[role=menu] li:not(.divider):visible a', $parent)
 
-      index = $items.index($items.filter(':focus'))
+    if (!$items.length) return
 
-      if (e.keyCode == 38 && index > 0) index--                                        // up
-      if (e.keyCode == 40 && index < $items.length - 1) index++                        // down
-      if (!~index) index = 0
+    var index = $items.index($items.filter(':focus'))
 
-      $items
-        .eq(index)
-        .focus()
-    }
+    if (e.keyCode == 38 && index > 0)                 index--                        // up
+    if (e.keyCode == 40 && index < $items.length - 1) index++                        // down
+    if (!~index)                                      index=0
 
+    $items.eq(index).focus()
   }
 
   function clearMenus() {
-    $(toggle).each(function () {
-      getParent($(this)).removeClass('open')
+    $(backdrop).remove()
+    $(toggle).each(function (e) {
+      var $parent = getParent($(this))
+      if (!$parent.hasClass('open')) return
+      $parent.trigger(e = $.Event('hide.bs.dropdown'))
+      if (e.isDefaultPrevented()) return
+      $parent.removeClass('open').trigger('hidden.bs.dropdown')
     })
   }
 
   function getParent($this) {
     var selector = $this.attr('data-target')
-      , $parent
 
     if (!selector) {
       selector = $this.attr('href')
       selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
     }
 
-    $parent = selector && $(selector)
-
-    if (!$parent || !$parent.length) $parent = $this.parent()
+    var $parent = selector && $(selector)
 
-    return $parent
+    return $parent && $parent.length ? $parent : $this.parent()
   }
 
 
-  /* DROPDOWN PLUGIN DEFINITION
-   * ========================== */
+  // DROPDOWN PLUGIN DEFINITION
+  // ==========================
 
   var old = $.fn.dropdown
 
   $.fn.dropdown = function (option) {
     return this.each(function () {
       var $this = $(this)
-        , data = $this.data('dropdown')
-      if (!data) $this.data('dropdown', (data = new Dropdown(this)))
+      var data  = $this.data('bs.dropdown')
+
+      if (!data) $this.data('bs.dropdown', (data = new Dropdown(this)))
       if (typeof option == 'string') data[option].call($this)
     })
   }
@@ -776,8 +811,8 @@
   $.fn.dropdown.Constructor = Dropdown
 
 
- /* DROPDOWN NO CONFLICT
-  * ==================== */
+  // DROPDOWN NO CONFLICT
+  // ====================
 
   $.fn.dropdown.noConflict = function () {
     $.fn.dropdown = old
@@ -785,22 +820,22 @@
   }
 
 
-  /* APPLY TO STANDARD DROPDOWN ELEMENTS
-   * =================================== */
+  // APPLY TO STANDARD DROPDOWN ELEMENTS
+  // ===================================
 
   $(document)
-    .on('click.dropdown.data-api', clearMenus)
-    .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
-    .on('click.dropdown-menu', function (e) { e.stopPropagation() })
-    .on('click.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
-    .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
-
-}(window.jQuery);
-/* =========================================================
- * bootstrap-modal.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#modals
- * =========================================================
- * Copyright 2012 Twitter, Inc.
+    .on('click.bs.dropdown.data-api', clearMenus)
+    .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
+    .on('click.bs.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
+    .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
+
+}(jQuery);
+
+/* ========================================================================
+ * Bootstrap: modal.js v3.0.3
+ * http://getbootstrap.com/javascript/#modals
+ * ========================================================================
+ * Copyright 2013 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -813,210 +848,205 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ========================================================= */
-
+ * ======================================================================== */
 
-!function ($) {
 
-  "use strict"; // jshint ;_;
++function ($) { "use strict";
 
-
- /* MODAL CLASS DEFINITION
-  * ====================== */
+  // MODAL CLASS DEFINITION
+  // ======================
 
   var Modal = function (element, options) {
-    this.options = options
-    this.$element = $(element)
-      .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
-    this.options.remote && this.$element.find('.modal-body').load(this.options.remote)
-  }
-
-  Modal.prototype = {
+    this.options   = options
+    this.$element  = $(element)
+    this.$backdrop =
+    this.isShown   = null
 
-      constructor: Modal
+    if (this.options.remote) this.$element.load(this.options.remote)
+  }
 
-    , toggle: function () {
-        return this[!this.isShown ? 'show' : 'hide']()
-      }
+  Modal.DEFAULTS = {
+      backdrop: true
+    , keyboard: true
+    , show: true
+  }
 
-    , show: function () {
-        var that = this
-          , e = $.Event('show')
+  Modal.prototype.toggle = function (_relatedTarget) {
+    return this[!this.isShown ? 'show' : 'hide'](_relatedTarget)
+  }
 
-        this.$element.trigger(e)
+  Modal.prototype.show = function (_relatedTarget) {
+    var that = this
+    var e    = $.Event('show.bs.modal', { relatedTarget: _relatedTarget })
 
-        if (this.isShown || e.isDefaultPrevented()) return
+    this.$element.trigger(e)
 
-        this.isShown = true
+    if (this.isShown || e.isDefaultPrevented()) return
 
-        this.escape()
+    this.isShown = true
 
-        this.backdrop(function () {
-          var transition = $.support.transition && that.$element.hasClass('fade')
+    this.escape()
 
-          if (!that.$element.parent().length) {
-            that.$element.appendTo(document.body) //don't move modals dom position
-          }
+    this.$element.on('click.dismiss.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
 
-          that.$element.show()
+    this.backdrop(function () {
+      var transition = $.support.transition && that.$element.hasClass('fade')
 
-          if (transition) {
-            that.$element[0].offsetWidth // force reflow
-          }
+      if (!that.$element.parent().length) {
+        that.$element.appendTo(document.body) // don't move modals dom position
+      }
 
-          that.$element
-            .addClass('in')
-            .attr('aria-hidden', false)
+      that.$element.show()
 
-          that.enforceFocus()
+      if (transition) {
+        that.$element[0].offsetWidth // force reflow
+      }
 
-          transition ?
-            that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown') }) :
-            that.$element.focus().trigger('shown')
+      that.$element
+        .addClass('in')
+        .attr('aria-hidden', false)
 
-        })
-      }
+      that.enforceFocus()
 
-    , hide: function (e) {
-        e && e.preventDefault()
+      var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget })
 
-        var that = this
+      transition ?
+        that.$element.find('.modal-dialog') // wait for modal to slide in
+          .one($.support.transition.end, function () {
+            that.$element.focus().trigger(e)
+          })
+          .emulateTransitionEnd(300) :
+        that.$element.focus().trigger(e)
+    })
+  }
 
-        e = $.Event('hide')
+  Modal.prototype.hide = function (e) {
+    if (e) e.preventDefault()
 
-        this.$element.trigger(e)
+    e = $.Event('hide.bs.modal')
 
-        if (!this.isShown || e.isDefaultPrevented()) return
+    this.$element.trigger(e)
 
-        this.isShown = false
+    if (!this.isShown || e.isDefaultPrevented()) return
 
-        this.escape()
+    this.isShown = false
 
-        $(document).off('focusin.modal')
+    this.escape()
 
-        this.$element
-          .removeClass('in')
-          .attr('aria-hidden', true)
+    $(document).off('focusin.bs.modal')
 
-        $.support.transition && this.$element.hasClass('fade') ?
-          this.hideWithTransition() :
-          this.hideModal()
-      }
+    this.$element
+      .removeClass('in')
+      .attr('aria-hidden', true)
+      .off('click.dismiss.modal')
 
-    , enforceFocus: function () {
-        var that = this
-        $(document).on('focusin.modal', function (e) {
-          if (that.$element[0] !== e.target && !that.$element.has(e.target).length) {
-            that.$element.focus()
-          }
-        })
-      }
+    $.support.transition && this.$element.hasClass('fade') ?
+      this.$element
+        .one($.support.transition.end, $.proxy(this.hideModal, this))
+        .emulateTransitionEnd(300) :
+      this.hideModal()
+  }
 
-    , escape: function () {
-        var that = this
-        if (this.isShown && this.options.keyboard) {
-          this.$element.on('keyup.dismiss.modal', function ( e ) {
-            e.which == 27 && that.hide()
-          })
-        } else if (!this.isShown) {
-          this.$element.off('keyup.dismiss.modal')
+  Modal.prototype.enforceFocus = function () {
+    $(document)
+      .off('focusin.bs.modal') // guard against infinite focus loop
+      .on('focusin.bs.modal', $.proxy(function (e) {
+        if (this.$element[0] !== e.target && !this.$element.has(e.target).length) {
+          this.$element.focus()
         }
-      }
-
-    , hideWithTransition: function () {
-        var that = this
-          , timeout = setTimeout(function () {
-              that.$element.off($.support.transition.end)
-              that.hideModal()
-            }, 500)
+      }, this))
+  }
 
-        this.$element.one($.support.transition.end, function () {
-          clearTimeout(timeout)
-          that.hideModal()
-        })
-      }
+  Modal.prototype.escape = function () {
+    if (this.isShown && this.options.keyboard) {
+      this.$element.on('keyup.dismiss.bs.modal', $.proxy(function (e) {
+        e.which == 27 && this.hide()
+      }, this))
+    } else if (!this.isShown) {
+      this.$element.off('keyup.dismiss.bs.modal')
+    }
+  }
 
-    , hideModal: function () {
-        var that = this
-        this.$element.hide()
-        this.backdrop(function () {
-          that.removeBackdrop()
-          that.$element.trigger('hidden')
-        })
-      }
+  Modal.prototype.hideModal = function () {
+    var that = this
+    this.$element.hide()
+    this.backdrop(function () {
+      that.removeBackdrop()
+      that.$element.trigger('hidden.bs.modal')
+    })
+  }
 
-    , removeBackdrop: function () {
-        this.$backdrop && this.$backdrop.remove()
-        this.$backdrop = null
-      }
+  Modal.prototype.removeBackdrop = function () {
+    this.$backdrop && this.$backdrop.remove()
+    this.$backdrop = null
+  }
 
-    , backdrop: function (callback) {
-        var that = this
-          , animate = this.$element.hasClass('fade') ? 'fade' : ''
+  Modal.prototype.backdrop = function (callback) {
+    var that    = this
+    var animate = this.$element.hasClass('fade') ? 'fade' : ''
 
-        if (this.isShown && this.options.backdrop) {
-          var doAnimate = $.support.transition && animate
+    if (this.isShown && this.options.backdrop) {
+      var doAnimate = $.support.transition && animate
 
-          this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
-            .appendTo(document.body)
+      this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
+        .appendTo(document.body)
 
-          this.$backdrop.click(
-            this.options.backdrop == 'static' ?
-              $.proxy(this.$element[0].focus, this.$element[0])
-            : $.proxy(this.hide, this)
-          )
+      this.$element.on('click.dismiss.modal', $.proxy(function (e) {
+        if (e.target !== e.currentTarget) return
+        this.options.backdrop == 'static'
+          ? this.$element[0].focus.call(this.$element[0])
+          : this.hide.call(this)
+      }, this))
 
-          if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
+      if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
 
-          this.$backdrop.addClass('in')
+      this.$backdrop.addClass('in')
 
-          if (!callback) return
+      if (!callback) return
 
-          doAnimate ?
-            this.$backdrop.one($.support.transition.end, callback) :
-            callback()
+      doAnimate ?
+        this.$backdrop
+          .one($.support.transition.end, callback)
+          .emulateTransitionEnd(150) :
+        callback()
 
-        } else if (!this.isShown && this.$backdrop) {
-          this.$backdrop.removeClass('in')
+    } else if (!this.isShown && this.$backdrop) {
+      this.$backdrop.removeClass('in')
 
-          $.support.transition && this.$element.hasClass('fade')?
-            this.$backdrop.one($.support.transition.end, callback) :
-            callback()
+      $.support.transition && this.$element.hasClass('fade')?
+        this.$backdrop
+          .one($.support.transition.end, callback)
+          .emulateTransitionEnd(150) :
+        callback()
 
-        } else if (callback) {
-          callback()
-        }
-      }
+    } else if (callback) {
+      callback()
+    }
   }
 
 
- /* MODAL PLUGIN DEFINITION
-  * ======================= */
+  // MODAL PLUGIN DEFINITION
+  // =======================
 
   var old = $.fn.modal
 
-  $.fn.modal = function (option) {
+  $.fn.modal = function (option, _relatedTarget) {
     return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('modal')
-        , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option)
-      if (!data) $this.data('modal', (data = new Modal(this, options)))
-      if (typeof option == 'string') data[option]()
-      else if (options.show) data.show()
-    })
-  }
+      var $this   = $(this)
+      var data    = $this.data('bs.modal')
+      var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option)
 
-  $.fn.modal.defaults = {
-      backdrop: true
-    , keyboard: true
-    , show: true
+      if (!data) $this.data('bs.modal', (data = new Modal(this, options)))
+      if (typeof option == 'string') data[option](_relatedTarget)
+      else if (options.show) data.show(_relatedTarget)
+    })
   }
 
   $.fn.modal.Constructor = Modal
 
 
- /* MODAL NO CONFLICT
-  * ================= */
+  // MODAL NO CONFLICT
+  // =================
 
   $.fn.modal.noConflict = function () {
     $.fn.modal = old
@@ -1024,31 +1054,36 @@
   }
 
 
- /* MODAL DATA-API
-  * ============== */
+  // MODAL DATA-API
+  // ==============
 
-  $(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) {
-    var $this = $(this)
-      , href = $this.attr('href')
-      , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
-      , option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data())
+  $(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) {
+    var $this   = $(this)
+    var href    = $this.attr('href')
+    var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
+    var option  = $target.data('modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
 
     e.preventDefault()
 
     $target
-      .modal(option)
+      .modal(option, this)
       .one('hide', function () {
-        $this.focus()
+        $this.is(':visible') && $this.focus()
       })
   })
 
-}(window.jQuery);
-/* ===========================================================
- * bootstrap-tooltip.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#tooltips
+  $(document)
+    .on('show.bs.modal',  '.modal', function () { $(document.body).addClass('modal-open') })
+    .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
+
+}(jQuery);
+
+/* ========================================================================
+ * Bootstrap: tooltip.js v3.0.3
+ * http://getbootstrap.com/javascript/#tooltip
  * Inspired by the original jQuery.tipsy by Jason Frame
- * ===========================================================
- * Copyright 2012 Twitter, Inc.
+ * ========================================================================
+ * Copyright 2013 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1061,354 +1096,380 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ========================================================== */
-
-
-!function ($) {
+ * ======================================================================== */
 
-  "use strict"; // jshint ;_;
 
++function ($) { "use strict";
 
- /* TOOLTIP PUBLIC CLASS DEFINITION
-  * =============================== */
+  // TOOLTIP PUBLIC CLASS DEFINITION
+  // ===============================
 
   var Tooltip = function (element, options) {
+    this.type       =
+    this.options    =
+    this.enabled    =
+    this.timeout    =
+    this.hoverState =
+    this.$element   = null
+
     this.init('tooltip', element, options)
   }
 
-  Tooltip.prototype = {
+  Tooltip.DEFAULTS = {
+    animation: true
+  , placement: 'top'
+  , selector: false
+  , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
+  , trigger: 'hover focus'
+  , title: ''
+  , delay: 0
+  , html: false
+  , container: false
+  }
 
-    constructor: Tooltip
+  Tooltip.prototype.init = function (type, element, options) {
+    this.enabled  = true
+    this.type     = type
+    this.$element = $(element)
+    this.options  = this.getOptions(options)
 
-  , init: function (type, element, options) {
-      var eventIn
-        , eventOut
-        , triggers
-        , trigger
-        , i
+    var triggers = this.options.trigger.split(' ')
 
-      this.type = type
-      this.$element = $(element)
-      this.options = this.getOptions(options)
-      this.enabled = true
+    for (var i = triggers.length; i--;) {
+      var trigger = triggers[i]
 
-      triggers = this.options.trigger.split(' ')
+      if (trigger == 'click') {
+        this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
+      } else if (trigger != 'manual') {
+        var eventIn  = trigger == 'hover' ? 'mouseenter' : 'focus'
+        var eventOut = trigger == 'hover' ? 'mouseleave' : 'blur'
 
-      for (i = triggers.length; i--;) {
-        trigger = triggers[i]
-        if (trigger == 'click') {
-          this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
-        } else if (trigger != 'manual') {
-          eventIn = trigger == 'hover' ? 'mouseenter' : 'focus'
-          eventOut = trigger == 'hover' ? 'mouseleave' : 'blur'
-          this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
-          this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
-        }
+        this.$element.on(eventIn  + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
+        this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
       }
-
-      this.options.selector ?
-        (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
-        this.fixTitle()
     }
 
-  , getOptions: function (options) {
-      options = $.extend({}, $.fn[this.type].defaults, this.$element.data(), options)
+    this.options.selector ?
+      (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
+      this.fixTitle()
+  }
 
-      if (options.delay && typeof options.delay == 'number') {
-        options.delay = {
-          show: options.delay
-        , hide: options.delay
-        }
-      }
+  Tooltip.prototype.getDefaults = function () {
+    return Tooltip.DEFAULTS
+  }
 
-      return options
+  Tooltip.prototype.getOptions = function (options) {
+    options = $.extend({}, this.getDefaults(), this.$element.data(), options)
+
+    if (options.delay && typeof options.delay == 'number') {
+      options.delay = {
+        show: options.delay
+      , hide: options.delay
+      }
     }
 
-  , enter: function (e) {
-      var defaults = $.fn[this.type].defaults
-        , options = {}
-        , self
+    return options
+  }
 
-      this._options && $.each(this._options, function (key, value) {
-        if (defaults[key] != value) options[key] = value
-      }, this)
+  Tooltip.prototype.getDelegateOptions = function () {
+    var options  = {}
+    var defaults = this.getDefaults()
 
-      self = $(e.currentTarget)[this.type](options).data(this.type)
+    this._options && $.each(this._options, function (key, value) {
+      if (defaults[key] != value) options[key] = value
+    })
 
-      if (!self.options.delay || !self.options.delay.show) return self.show()
+    return options
+  }
 
-      clearTimeout(this.timeout)
-      self.hoverState = 'in'
-      this.timeout = setTimeout(function() {
-        if (self.hoverState == 'in') self.show()
-      }, self.options.delay.show)
-    }
+  Tooltip.prototype.enter = function (obj) {
+    var self = obj instanceof this.constructor ?
+      obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type)
 
-  , leave: function (e) {
-      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+    clearTimeout(self.timeout)
 
-      if (this.timeout) clearTimeout(this.timeout)
-      if (!self.options.delay || !self.options.delay.hide) return self.hide()
+    self.hoverState = 'in'
 
-      self.hoverState = 'out'
-      this.timeout = setTimeout(function() {
-        if (self.hoverState == 'out') self.hide()
-      }, self.options.delay.hide)
-    }
+    if (!self.options.delay || !self.options.delay.show) return self.show()
 
-  , show: function () {
-      var $tip
-        , pos
-        , actualWidth
-        , actualHeight
-        , placement
-        , tp
-        , e = $.Event('show')
-
-      if (this.hasContent() && this.enabled) {
-        this.$element.trigger(e)
-        if (e.isDefaultPrevented()) return
-        $tip = this.tip()
-        this.setContent()
-
-        if (this.options.animation) {
-          $tip.addClass('fade')
-        }
+    self.timeout = setTimeout(function () {
+      if (self.hoverState == 'in') self.show()
+    }, self.options.delay.show)
+  }
 
-        placement = typeof this.options.placement == 'function' ?
-          this.options.placement.call(this, $tip[0], this.$element[0]) :
-          this.options.placement
+  Tooltip.prototype.leave = function (obj) {
+    var self = obj instanceof this.constructor ?
+      obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type)
 
-        $tip
-          .detach()
-          .css({ top: 0, left: 0, display: 'block' })
+    clearTimeout(self.timeout)
 
-        this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
+    self.hoverState = 'out'
 
-        pos = this.getPosition()
+    if (!self.options.delay || !self.options.delay.hide) return self.hide()
 
-        actualWidth = $tip[0].offsetWidth
-        actualHeight = $tip[0].offsetHeight
+    self.timeout = setTimeout(function () {
+      if (self.hoverState == 'out') self.hide()
+    }, self.options.delay.hide)
+  }
 
-        switch (placement) {
-          case 'bottom':
-            tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}
-            break
-          case 'top':
-            tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2}
-            break
-          case 'left':
-            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth}
-            break
-          case 'right':
-            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width}
-            break
-        }
+  Tooltip.prototype.show = function () {
+    var e = $.Event('show.bs.'+ this.type)
 
-        this.applyPlacement(tp, placement)
-        this.$element.trigger('shown')
-      }
-    }
+    if (this.hasContent() && this.enabled) {
+      this.$element.trigger(e)
+
+      if (e.isDefaultPrevented()) return
 
-  , applyPlacement: function(offset, placement){
       var $tip = this.tip()
-        , width = $tip[0].offsetWidth
-        , height = $tip[0].offsetHeight
-        , actualWidth
-        , actualHeight
-        , delta
-        , replace
+
+      this.setContent()
+
+      if (this.options.animation) $tip.addClass('fade')
+
+      var placement = typeof this.options.placement == 'function' ?
+        this.options.placement.call(this, $tip[0], this.$element[0]) :
+        this.options.placement
+
+      var autoToken = /\s?auto?\s?/i
+      var autoPlace = autoToken.test(placement)
+      if (autoPlace) placement = placement.replace(autoToken, '') || 'top'
 
       $tip
-        .offset(offset)
+        .detach()
+        .css({ top: 0, left: 0, display: 'block' })
         .addClass(placement)
-        .addClass('in')
 
-      actualWidth = $tip[0].offsetWidth
-      actualHeight = $tip[0].offsetHeight
+      this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
 
-      if (placement == 'top' && actualHeight != height) {
-        offset.top = offset.top + height - actualHeight
-        replace = true
-      }
+      var pos          = this.getPosition()
+      var actualWidth  = $tip[0].offsetWidth
+      var actualHeight = $tip[0].offsetHeight
 
-      if (placement == 'bottom' || placement == 'top') {
-        delta = 0
+      if (autoPlace) {
+        var $parent = this.$element.parent()
 
-        if (offset.left < 0){
-          delta = offset.left * -2
-          offset.left = 0
-          $tip.offset(offset)
-          actualWidth = $tip[0].offsetWidth
-          actualHeight = $tip[0].offsetHeight
-        }
+        var orgPlacement = placement
+        var docScroll    = document.documentElement.scrollTop || document.body.scrollTop
+        var parentWidth  = this.options.container == 'body' ? window.innerWidth  : $parent.outerWidth()
+        var parentHeight = this.options.container == 'body' ? window.innerHeight : $parent.outerHeight()
+        var parentLeft   = this.options.container == 'body' ? 0 : $parent.offset().left
 
-        this.replaceArrow(delta - width + actualWidth, actualWidth, 'left')
-      } else {
-        this.replaceArrow(actualHeight - height, actualHeight, 'top')
+        placement = placement == 'bottom' && pos.top   + pos.height  + actualHeight - docScroll > parentHeight  ? 'top'    :
+                    placement == 'top'    && pos.top   - docScroll   - actualHeight < 0                         ? 'bottom' :
+                    placement == 'right'  && pos.right + actualWidth > parentWidth                              ? 'left'   :
+                    placement == 'left'   && pos.left  - actualWidth < parentLeft                               ? 'right'  :
+                    placement
+
+        $tip
+          .removeClass(orgPlacement)
+          .addClass(placement)
       }
 
-      if (replace) $tip.offset(offset)
-    }
+      var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
 
-  , replaceArrow: function(delta, dimension, position){
-      this
-        .arrow()
-        .css(position, delta ? (50 * (1 - delta / dimension) + "%") : '')
+      this.applyPlacement(calculatedOffset, placement)
+      this.$element.trigger('shown.bs.' + this.type)
     }
+  }
 
-  , setContent: function () {
-      var $tip = this.tip()
-        , title = this.getTitle()
+  Tooltip.prototype.applyPlacement = function(offset, placement) {
+    var replace
+    var $tip   = this.tip()
+    var width  = $tip[0].offsetWidth
+    var height = $tip[0].offsetHeight
 
-      $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
-      $tip.removeClass('fade in top bottom left right')
-    }
+    // manually read margins because getBoundingClientRect includes difference
+    var marginTop = parseInt($tip.css('margin-top'), 10)
+    var marginLeft = parseInt($tip.css('margin-left'), 10)
 
-  , hide: function () {
-      var that = this
-        , $tip = this.tip()
-        , e = $.Event('hide')
+    // we must check for NaN for ie 8/9
+    if (isNaN(marginTop))  marginTop  = 0
+    if (isNaN(marginLeft)) marginLeft = 0
 
-      this.$element.trigger(e)
-      if (e.isDefaultPrevented()) return
+    offset.top  = offset.top  + marginTop
+    offset.left = offset.left + marginLeft
 
-      $tip.removeClass('in')
+    $tip
+      .offset(offset)
+      .addClass('in')
 
-      function removeWithAnimation() {
-        var timeout = setTimeout(function () {
-          $tip.off($.support.transition.end).detach()
-        }, 500)
+    // check to see if placing tip in new offset caused the tip to resize itself
+    var actualWidth  = $tip[0].offsetWidth
+    var actualHeight = $tip[0].offsetHeight
 
-        $tip.one($.support.transition.end, function () {
-          clearTimeout(timeout)
-          $tip.detach()
-        })
-      }
+    if (placement == 'top' && actualHeight != height) {
+      replace = true
+      offset.top = offset.top + height - actualHeight
+    }
 
-      $.support.transition && this.$tip.hasClass('fade') ?
-        removeWithAnimation() :
-        $tip.detach()
+    if (/bottom|top/.test(placement)) {
+      var delta = 0
 
-      this.$element.trigger('hidden')
+      if (offset.left < 0) {
+        delta       = offset.left * -2
+        offset.left = 0
 
-      return this
-    }
+        $tip.offset(offset)
 
-  , fixTitle: function () {
-      var $e = this.$element
-      if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
-        $e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
+        actualWidth  = $tip[0].offsetWidth
+        actualHeight = $tip[0].offsetHeight
       }
-    }
 
-  , hasContent: function () {
-      return this.getTitle()
+      this.replaceArrow(delta - width + actualWidth, actualWidth, 'left')
+    } else {
+      this.replaceArrow(actualHeight - height, actualHeight, 'top')
     }
 
-  , getPosition: function () {
-      var el = this.$element[0]
-      return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : {
-        width: el.offsetWidth
-      , height: el.offsetHeight
-      }, this.$element.offset())
-    }
+    if (replace) $tip.offset(offset)
+  }
 
-  , getTitle: function () {
-      var title
-        , $e = this.$element
-        , o = this.options
+  Tooltip.prototype.replaceArrow = function(delta, dimension, position) {
+    this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + "%") : '')
+  }
 
-      title = $e.attr('data-original-title')
-        || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
+  Tooltip.prototype.setContent = function () {
+    var $tip  = this.tip()
+    var title = this.getTitle()
 
-      return title
-    }
+    $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
+    $tip.removeClass('fade in top bottom left right')
+  }
 
-  , tip: function () {
-      return this.$tip = this.$tip || $(this.options.template)
-    }
+  Tooltip.prototype.hide = function () {
+    var that = this
+    var $tip = this.tip()
+    var e    = $.Event('hide.bs.' + this.type)
 
-  , arrow: function(){
-      return this.$arrow = this.$arrow || this.tip().find(".tooltip-arrow")
+    function complete() {
+      if (that.hoverState != 'in') $tip.detach()
     }
 
-  , validate: function () {
-      if (!this.$element[0].parentNode) {
-        this.hide()
-        this.$element = null
-        this.options = null
-      }
-    }
+    this.$element.trigger(e)
 
-  , enable: function () {
-      this.enabled = true
-    }
+    if (e.isDefaultPrevented()) return
 
-  , disable: function () {
-      this.enabled = false
-    }
+    $tip.removeClass('in')
 
-  , toggleEnabled: function () {
-      this.enabled = !this.enabled
-    }
+    $.support.transition && this.$tip.hasClass('fade') ?
+      $tip
+        .one($.support.transition.end, complete)
+        .emulateTransitionEnd(150) :
+      complete()
 
-  , toggle: function (e) {
-      var self = e ? $(e.currentTarget)[this.type](this._options).data(this.type) : this
-      self.tip().hasClass('in') ? self.hide() : self.show()
+    this.$element.trigger('hidden.bs.' + this.type)
+
+    return this
+  }
+
+  Tooltip.prototype.fixTitle = function () {
+    var $e = this.$element
+    if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
+      $e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
     }
+  }
+
+  Tooltip.prototype.hasContent = function () {
+    return this.getTitle()
+  }
+
+  Tooltip.prototype.getPosition = function () {
+    var el = this.$element[0]
+    return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : {
+      width: el.offsetWidth
+    , height: el.offsetHeight
+    }, this.$element.offset())
+  }
+
+  Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) {
+    return placement == 'bottom' ? { top: pos.top + pos.height,   left: pos.left + pos.width / 2 - actualWidth / 2  } :
+           placement == 'top'    ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2  } :
+           placement == 'left'   ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } :
+        /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width   }
+  }
 
-  , destroy: function () {
-      this.hide().$element.off('.' + this.type).removeData(this.type)
+  Tooltip.prototype.getTitle = function () {
+    var title
+    var $e = this.$element
+    var o  = this.options
+
+    title = $e.attr('data-original-title')
+      || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
+
+    return title
+  }
+
+  Tooltip.prototype.tip = function () {
+    return this.$tip = this.$tip || $(this.options.template)
+  }
+
+  Tooltip.prototype.arrow = function () {
+    return this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow')
+  }
+
+  Tooltip.prototype.validate = function () {
+    if (!this.$element[0].parentNode) {
+      this.hide()
+      this.$element = null
+      this.options  = null
     }
+  }
 
+  Tooltip.prototype.enable = function () {
+    this.enabled = true
   }
 
+  Tooltip.prototype.disable = function () {
+    this.enabled = false
+  }
 
- /* TOOLTIP PLUGIN DEFINITION
-  * ========================= */
+  Tooltip.prototype.toggleEnabled = function () {
+    this.enabled = !this.enabled
+  }
+
+  Tooltip.prototype.toggle = function (e) {
+    var self = e ? $(e.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) : this
+    self.tip().hasClass('in') ? self.leave(self) : self.enter(self)
+  }
+
+  Tooltip.prototype.destroy = function () {
+    this.hide().$element.off('.' + this.type).removeData('bs.' + this.type)
+  }
+
+
+  // TOOLTIP PLUGIN DEFINITION
+  // =========================
 
   var old = $.fn.tooltip
 
-  $.fn.tooltip = function ( option ) {
+  $.fn.tooltip = function (option) {
     return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('tooltip')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('tooltip', (data = new Tooltip(this, options)))
+      var $this   = $(this)
+      var data    = $this.data('bs.tooltip')
+      var options = typeof option == 'object' && option
+
+      if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
       if (typeof option == 'string') data[option]()
     })
   }
 
   $.fn.tooltip.Constructor = Tooltip
 
-  $.fn.tooltip.defaults = {
-    animation: true
-  , placement: 'top'
-  , selector: false
-  , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
-  , trigger: 'hover focus'
-  , title: ''
-  , delay: 0
-  , html: false
-  , container: false
-  }
-
 
- /* TOOLTIP NO CONFLICT
-  * =================== */
+  // TOOLTIP NO CONFLICT
+  // ===================
 
   $.fn.tooltip.noConflict = function () {
     $.fn.tooltip = old
     return this
   }
 
-}(window.jQuery);
-/* ===========================================================
- * bootstrap-popover.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#popovers
- * ===========================================================
- * Copyright 2012 Twitter, Inc.
+}(jQuery);
+
+/* ========================================================================
+ * Bootstrap: popover.js v3.0.3
+ * http://getbootstrap.com/javascript/#popovers
+ * ========================================================================
+ * Copyright 2013 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1421,108 +1482,112 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * =========================================================== */
-
-
-!function ($) {
+ * ======================================================================== */
 
-  "use strict"; // jshint ;_;
 
++function ($) { "use strict";
 
- /* POPOVER PUBLIC CLASS DEFINITION
-  * =============================== */
+  // POPOVER PUBLIC CLASS DEFINITION
+  // ===============================
 
   var Popover = function (element, options) {
     this.init('popover', element, options)
   }
 
+  if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
 
-  /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js
-     ========================================== */
+  Popover.DEFAULTS = $.extend({} , $.fn.tooltip.Constructor.DEFAULTS, {
+    placement: 'right'
+  , trigger: 'click'
+  , content: ''
+  , template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
+  })
 
-  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, {
 
-    constructor: Popover
+  // NOTE: POPOVER EXTENDS tooltip.js
+  // ================================
 
-  , setContent: function () {
-      var $tip = this.tip()
-        , title = this.getTitle()
-        , content = this.getContent()
+  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype)
 
-      $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
-      $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content)
+  Popover.prototype.constructor = Popover
 
-      $tip.removeClass('fade top bottom left right in')
-    }
+  Popover.prototype.getDefaults = function () {
+    return Popover.DEFAULTS
+  }
 
-  , hasContent: function () {
-      return this.getTitle() || this.getContent()
-    }
+  Popover.prototype.setContent = function () {
+    var $tip    = this.tip()
+    var title   = this.getTitle()
+    var content = this.getContent()
 
-  , getContent: function () {
-      var content
-        , $e = this.$element
-        , o = this.options
+    $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
+    $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content)
 
-      content = (typeof o.content == 'function' ? o.content.call($e[0]) :  o.content)
-        || $e.attr('data-content')
+    $tip.removeClass('fade top bottom left right in')
 
-      return content
-    }
+    // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
+    // this manually by checking the contents.
+    if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide()
+  }
 
-  , tip: function () {
-      if (!this.$tip) {
-        this.$tip = $(this.options.template)
-      }
-      return this.$tip
-    }
+  Popover.prototype.hasContent = function () {
+    return this.getTitle() || this.getContent()
+  }
 
-  , destroy: function () {
-      this.hide().$element.off('.' + this.type).removeData(this.type)
-    }
+  Popover.prototype.getContent = function () {
+    var $e = this.$element
+    var o  = this.options
 
-  })
+    return $e.attr('data-content')
+      || (typeof o.content == 'function' ?
+            o.content.call($e[0]) :
+            o.content)
+  }
 
+  Popover.prototype.arrow = function () {
+    return this.$arrow = this.$arrow || this.tip().find('.arrow')
+  }
 
- /* POPOVER PLUGIN DEFINITION
-  * ======================= */
+  Popover.prototype.tip = function () {
+    if (!this.$tip) this.$tip = $(this.options.template)
+    return this.$tip
+  }
+
+
+  // POPOVER PLUGIN DEFINITION
+  // =========================
 
   var old = $.fn.popover
 
   $.fn.popover = function (option) {
     return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('popover')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('popover', (data = new Popover(this, options)))
+      var $this   = $(this)
+      var data    = $this.data('bs.popover')
+      var options = typeof option == 'object' && option
+
+      if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
       if (typeof option == 'string') data[option]()
     })
   }
 
   $.fn.popover.Constructor = Popover
 
-  $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, {
-    placement: 'right'
-  , trigger: 'click'
-  , content: ''
-  , template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
-  })
 
-
- /* POPOVER NO CONFLICT
-  * =================== */
+  // POPOVER NO CONFLICT
+  // ===================
 
   $.fn.popover.noConflict = function () {
     $.fn.popover = old
     return this
   }
 
-}(window.jQuery);
-/* =============================================================
- * bootstrap-scrollspy.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#scrollspy
- * =============================================================
- * Copyright 2012 Twitter, Inc.
+}(jQuery);
+
+/* ========================================================================
+ * Bootstrap: scrollspy.js v3.0.3
+ * http://getbootstrap.com/javascript/#scrollspy
+ * ========================================================================
+ * Copyright 2013 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1535,133 +1600,129 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ============================================================== */
-
-
-!function ($) {
+ * ======================================================================== */
 
-  "use strict"; // jshint ;_;
 
++function ($) { "use strict";
 
- /* SCROLLSPY CLASS DEFINITION
-  * ========================== */
+  // SCROLLSPY CLASS DEFINITION
+  // ==========================
 
   function ScrollSpy(element, options) {
-    var process = $.proxy(this.process, this)
-      , $element = $(element).is('body') ? $(window) : $(element)
-      , href
-    this.options = $.extend({}, $.fn.scrollspy.defaults, options)
-    this.$scrollElement = $element.on('scroll.scroll-spy.data-api', process)
-    this.selector = (this.options.target
+    var href
+    var process  = $.proxy(this.process, this)
+
+    this.$element       = $(element).is('body') ? $(window) : $(element)
+    this.$body          = $('body')
+    this.$scrollElement = this.$element.on('scroll.bs.scroll-spy.data-api', process)
+    this.options        = $.extend({}, ScrollSpy.DEFAULTS, options)
+    this.selector       = (this.options.target
       || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
       || '') + ' .nav li > a'
-    this.$body = $('body')
+    this.offsets        = $([])
+    this.targets        = $([])
+    this.activeTarget   = null
+
     this.refresh()
     this.process()
   }
 
-  ScrollSpy.prototype = {
+  ScrollSpy.DEFAULTS = {
+    offset: 10
+  }
 
-      constructor: ScrollSpy
+  ScrollSpy.prototype.refresh = function () {
+    var offsetMethod = this.$element[0] == window ? 'offset' : 'position'
 
-    , refresh: function () {
-        var self = this
-          , $targets
+    this.offsets = $([])
+    this.targets = $([])
 
-        this.offsets = $([])
-        this.targets = $([])
+    var self     = this
+    var $targets = this.$body
+      .find(this.selector)
+      .map(function () {
+        var $el   = $(this)
+        var href  = $el.data('target') || $el.attr('href')
+        var $href = /^#\w/.test(href) && $(href)
 
-        $targets = this.$body
-          .find(this.selector)
-          .map(function () {
-            var $el = $(this)
-              , href = $el.data('target') || $el.attr('href')
-              , $href = /^#\w/.test(href) && $(href)
-            return ( $href
-              && $href.length
-              && [[ $href.position().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]] ) || null
-          })
-          .sort(function (a, b) { return a[0] - b[0] })
-          .each(function () {
-            self.offsets.push(this[0])
-            self.targets.push(this[1])
-          })
-      }
-
-    , process: function () {
-        var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
-          , scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight
-          , maxScroll = scrollHeight - this.$scrollElement.height()
-          , offsets = this.offsets
-          , targets = this.targets
-          , activeTarget = this.activeTarget
-          , i
-
-        if (scrollTop >= maxScroll) {
-          return activeTarget != (i = targets.last()[0])
-            && this.activate ( i )
-        }
+        return ($href
+          && $href.length
+          && [[ $href[offsetMethod]().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]]) || null
+      })
+      .sort(function (a, b) { return a[0] - b[0] })
+      .each(function () {
+        self.offsets.push(this[0])
+        self.targets.push(this[1])
+      })
+  }
 
-        for (i = offsets.length; i--;) {
-          activeTarget != targets[i]
-            && scrollTop >= offsets[i]
-            && (!offsets[i + 1] || scrollTop <= offsets[i + 1])
-            && this.activate( targets[i] )
-        }
-      }
+  ScrollSpy.prototype.process = function () {
+    var scrollTop    = this.$scrollElement.scrollTop() + this.options.offset
+    var scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight
+    var maxScroll    = scrollHeight - this.$scrollElement.height()
+    var offsets      = this.offsets
+    var targets      = this.targets
+    var activeTarget = this.activeTarget
+    var i
 
-    , activate: function (target) {
-        var active
-          , selector
+    if (scrollTop >= maxScroll) {
+      return activeTarget != (i = targets.last()[0]) && this.activate(i)
+    }
 
-        this.activeTarget = target
+    for (i = offsets.length; i--;) {
+      activeTarget != targets[i]
+        && scrollTop >= offsets[i]
+        && (!offsets[i + 1] || scrollTop <= offsets[i + 1])
+        && this.activate( targets[i] )
+    }
+  }
 
-        $(this.selector)
-          .parent('.active')
-          .removeClass('active')
+  ScrollSpy.prototype.activate = function (target) {
+    this.activeTarget = target
 
-        selector = this.selector
-          + '[data-target="' + target + '"],'
-          + this.selector + '[href="' + target + '"]'
+    $(this.selector)
+      .parents('.active')
+      .removeClass('active')
 
-        active = $(selector)
-          .parent('li')
-          .addClass('active')
+    var selector = this.selector
+      + '[data-target="' + target + '"],'
+      + this.selector + '[href="' + target + '"]'
 
-        if (active.parent('.dropdown-menu').length)  {
-          active = active.closest('li.dropdown').addClass('active')
-        }
+    var active = $(selector)
+      .parents('li')
+      .addClass('active')
 
-        active.trigger('activate')
-      }
+    if (active.parent('.dropdown-menu').length)  {
+      active = active
+        .closest('li.dropdown')
+        .addClass('active')
+    }
 
+    active.trigger('activate.bs.scrollspy')
   }
 
 
- /* SCROLLSPY PLUGIN DEFINITION
-  * =========================== */
+  // SCROLLSPY PLUGIN DEFINITION
+  // ===========================
 
   var old = $.fn.scrollspy
 
   $.fn.scrollspy = function (option) {
     return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('scrollspy')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options)))
+      var $this   = $(this)
+      var data    = $this.data('bs.scrollspy')
+      var options = typeof option == 'object' && option
+
+      if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options)))
       if (typeof option == 'string') data[option]()
     })
   }
 
   $.fn.scrollspy.Constructor = ScrollSpy
 
-  $.fn.scrollspy.defaults = {
-    offset: 10
-  }
 
-
- /* SCROLLSPY NO CONFLICT
-  * ===================== */
+  // SCROLLSPY NO CONFLICT
+  // =====================
 
   $.fn.scrollspy.noConflict = function () {
     $.fn.scrollspy = old
@@ -1669,8 +1730,8 @@
   }
 
 
- /* SCROLLSPY DATA-API
-  * ================== */
+  // SCROLLSPY DATA-API
+  // ==================
 
   $(window).on('load', function () {
     $('[data-spy="scroll"]').each(function () {
@@ -1679,11 +1740,13 @@
     })
   })
 
-}(window.jQuery);/* ========================================================
- * bootstrap-tab.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#tabs
- * ========================================================
- * Copyright 2012 Twitter, Inc.
+}(jQuery);
+
+/* ========================================================================
+ * Bootstrap: tab.js v3.0.3
+ * http://getbootstrap.com/javascript/#tabs
+ * ========================================================================
+ * Copyright 2013 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1696,108 +1759,99 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ======================================================== */
-
-
-!function ($) {
+ * ======================================================================== */
 
-  "use strict"; // jshint ;_;
 
++function ($) { "use strict";
 
- /* TAB CLASS DEFINITION
-  * ==================== */
+  // TAB CLASS DEFINITION
+  // ====================
 
   var Tab = function (element) {
     this.element = $(element)
   }
 
-  Tab.prototype = {
+  Tab.prototype.show = function () {
+    var $this    = this.element
+    var $ul      = $this.closest('ul:not(.dropdown-menu)')
+    var selector = $this.data('target')
 
-    constructor: Tab
-
-  , show: function () {
-      var $this = this.element
-        , $ul = $this.closest('ul:not(.dropdown-menu)')
-        , selector = $this.attr('data-target')
-        , previous
-        , $target
-        , e
-
-      if (!selector) {
-        selector = $this.attr('href')
-        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
-      }
-
-      if ( $this.parent('li').hasClass('active') ) return
+    if (!selector) {
+      selector = $this.attr('href')
+      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+    }
 
-      previous = $ul.find('.active:last a')[0]
+    if ($this.parent('li').hasClass('active')) return
 
-      e = $.Event('show', {
-        relatedTarget: previous
-      })
+    var previous = $ul.find('.active:last a')[0]
+    var e        = $.Event('show.bs.tab', {
+      relatedTarget: previous
+    })
 
-      $this.trigger(e)
+    $this.trigger(e)
 
-      if (e.isDefaultPrevented()) return
+    if (e.isDefaultPrevented()) return
 
-      $target = $(selector)
+    var $target = $(selector)
 
-      this.activate($this.parent('li'), $ul)
-      this.activate($target, $target.parent(), function () {
-        $this.trigger({
-          type: 'shown'
-        , relatedTarget: previous
-        })
+    this.activate($this.parent('li'), $ul)
+    this.activate($target, $target.parent(), function () {
+      $this.trigger({
+        type: 'shown.bs.tab'
+      , relatedTarget: previous
       })
-    }
+    })
+  }
 
-  , activate: function ( element, container, callback) {
-      var $active = container.find('> .active')
-        , transition = callback
-            && $.support.transition
-            && $active.hasClass('fade')
-
-      function next() {
-        $active
-          .removeClass('active')
-          .find('> .dropdown-menu > .active')
-          .removeClass('active')
-
-        element.addClass('active')
-
-        if (transition) {
-          element[0].offsetWidth // reflow for transition
-          element.addClass('in')
-        } else {
-          element.removeClass('fade')
-        }
+  Tab.prototype.activate = function (element, container, callback) {
+    var $active    = container.find('> .active')
+    var transition = callback
+      && $.support.transition
+      && $active.hasClass('fade')
 
-        if ( element.parent('.dropdown-menu') ) {
-          element.closest('li.dropdown').addClass('active')
-        }
+    function next() {
+      $active
+        .removeClass('active')
+        .find('> .dropdown-menu > .active')
+        .removeClass('active')
 
-        callback && callback()
+      element.addClass('active')
+
+      if (transition) {
+        element[0].offsetWidth // reflow for transition
+        element.addClass('in')
+      } else {
+        element.removeClass('fade')
       }
 
-      transition ?
-        $active.one($.support.transition.end, next) :
-        next()
+      if (element.parent('.dropdown-menu')) {
+        element.closest('li.dropdown').addClass('active')
+      }
 
-      $active.removeClass('in')
+      callback && callback()
     }
+
+    transition ?
+      $active
+        .one($.support.transition.end, next)
+        .emulateTransitionEnd(150) :
+      next()
+
+    $active.removeClass('in')
   }
 
 
- /* TAB PLUGIN DEFINITION
-  * ===================== */
+  // TAB PLUGIN DEFINITION
+  // =====================
 
   var old = $.fn.tab
 
   $.fn.tab = function ( option ) {
     return this.each(function () {
       var $this = $(this)
-        , data = $this.data('tab')
-      if (!data) $this.data('tab', (data = new Tab(this)))
+      var data  = $this.data('bs.tab')
+
+      if (!data) $this.data('bs.tab', (data = new Tab(this)))
       if (typeof option == 'string') data[option]()
     })
   }
@@ -1805,8 +1859,8 @@
   $.fn.tab.Constructor = Tab
 
 
- /* TAB NO CONFLICT
-  * =============== */
+  // TAB NO CONFLICT
+  // ===============
 
   $.fn.tab.noConflict = function () {
     $.fn.tab = old
@@ -1814,19 +1868,21 @@
   }
 
 
- /* TAB DATA-API
-  * ============ */
+  // TAB DATA-API
+  // ============
 
-  $(document).on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
+  $(document).on('click.bs.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
     e.preventDefault()
     $(this).tab('show')
   })
 
-}(window.jQuery);/* =============================================================
- * bootstrap-typeahead.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#typeahead
- * =============================================================
- * Copyright 2012 Twitter, Inc.
+}(jQuery);
+
+/* ========================================================================
+ * Bootstrap: affix.js v3.0.3
+ * http://getbootstrap.com/javascript/#affix
+ * ========================================================================
+ * Copyright 2013 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1839,415 +1895,90 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ============================================================ */
+ * ======================================================================== */
 
 
-!function($){
++function ($) { "use strict";
 
-  "use strict"; // jshint ;_;
+  // AFFIX CLASS DEFINITION
+  // ======================
 
+  var Affix = function (element, options) {
+    this.options = $.extend({}, Affix.DEFAULTS, options)
+    this.$window = $(window)
+      .on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this))
+      .on('click.bs.affix.data-api',  $.proxy(this.checkPositionWithEventLoop, this))
 
- /* TYPEAHEAD PUBLIC CLASS DEFINITION
-  * ================================= */
-
-  var Typeahead = function (element, options) {
     this.$element = $(element)
-    this.options = $.extend({}, $.fn.typeahead.defaults, options)
-    this.matcher = this.options.matcher || this.matcher
-    this.sorter = this.options.sorter || this.sorter
-    this.highlighter = this.options.highlighter || this.highlighter
-    this.updater = this.options.updater || this.updater
-    this.source = this.options.source
-    this.$menu = $(this.options.menu)
-    this.shown = false
-    this.listen()
-  }
-
-  Typeahead.prototype = {
-
-    constructor: Typeahead
-
-  , select: function () {
-      var val = this.$menu.find('.active').attr('data-value')
-      this.$element
-        .val(this.updater(val))
-        .change()
-      return this.hide()
-    }
-
-  , updater: function (item) {
-      return item
-    }
-
-  , show: function () {
-      var pos = $.extend({}, this.$element.position(), {
-        height: this.$element[0].offsetHeight
-      })
-
-      this.$menu
-        .insertAfter(this.$element)
-        .css({
-          top: pos.top + pos.height
-        , left: pos.left
-        })
-        .show()
-
-      this.shown = true
-      return this
-    }
-
-  , hide: function () {
-      this.$menu.hide()
-      this.shown = false
-      return this
-    }
-
-  , lookup: function (event) {
-      var items
-
-      this.query = this.$element.val()
-
-      if (!this.query || this.query.length < this.options.minLength) {
-        return this.shown ? this.hide() : this
-      }
-
-      items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source
-
-      return items ? this.process(items) : this
-    }
-
-  , process: function (items) {
-      var that = this
-
-      items = $.grep(items, function (item) {
-        return that.matcher(item)
-      })
-
-      items = this.sorter(items)
+    this.affixed  =
+    this.unpin    = null
 
-      if (!items.length) {
-        return this.shown ? this.hide() : this
-      }
-
-      return this.render(items.slice(0, this.options.items)).show()
-    }
-
-  , matcher: function (item) {
-      return ~item.toLowerCase().indexOf(this.query.toLowerCase())
-    }
-
-  , sorter: function (items) {
-      var beginswith = []
-        , caseSensitive = []
-        , caseInsensitive = []
-        , item
-
-      while (item = items.shift()) {
-        if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item)
-        else if (~item.indexOf(this.query)) caseSensitive.push(item)
-        else caseInsensitive.push(item)
-      }
-
-      return beginswith.concat(caseSensitive, caseInsensitive)
-    }
-
-  , highlighter: function (item) {
-      var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&')
-      return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) {
-        return '<strong>' + match + '</strong>'
-      })
-    }
-
-  , render: function (items) {
-      var that = this
-
-      items = $(items).map(function (i, item) {
-        i = $(that.options.item).attr('data-value', item)
-        i.find('a').html(that.highlighter(item))
-        return i[0]
-      })
-
-      items.first().addClass('active')
-      this.$menu.html(items)
-      return this
-    }
-
-  , next: function (event) {
-      var active = this.$menu.find('.active').removeClass('active')
-        , next = active.next()
-
-      if (!next.length) {
-        next = $(this.$menu.find('li')[0])
-      }
-
-      next.addClass('active')
-    }
-
-  , prev: function (event) {
-      var active = this.$menu.find('.active').removeClass('active')
-        , prev = active.prev()
-
-      if (!prev.length) {
-        prev = this.$menu.find('li').last()
-      }
-
-      prev.addClass('active')
-    }
-
-  , listen: function () {
-      this.$element
-        .on('focus',    $.proxy(this.focus, this))
-        .on('blur',     $.proxy(this.blur, this))
-        .on('keypress', $.proxy(this.keypress, this))
-        .on('keyup',    $.proxy(this.keyup, this))
-
-      if (this.eventSupported('keydown')) {
-        this.$element.on('keydown', $.proxy(this.keydown, this))
-      }
-
-      this.$menu
-        .on('click', $.proxy(this.click, this))
-        .on('mouseenter', 'li', $.proxy(this.mouseenter, this))
-        .on('mouseleave', 'li', $.proxy(this.mouseleave, this))
-    }
-
-  , eventSupported: function(eventName) {
-      var isSupported = eventName in this.$element
-      if (!isSupported) {
-        this.$element.setAttribute(eventName, 'return;')
-        isSupported = typeof this.$element[eventName] === 'function'
-      }
-      return isSupported
-    }
-
-  , move: function (e) {
-      if (!this.shown) return
-
-      switch(e.keyCode) {
-        case 9: // tab
-        case 13: // enter
-        case 27: // escape
-          e.preventDefault()
-          break
-
-        case 38: // up arrow
-          e.preventDefault()
-          this.prev()
-          break
-
-        case 40: // down arrow
-          e.preventDefault()
-          this.next()
-          break
-      }
-
-      e.stopPropagation()
-    }
-
-  , keydown: function (e) {
-      this.suppressKeyPressRepeat = ~$.inArray(e.keyCode, [40,38,9,13,27])
-      this.move(e)
-    }
-
-  , keypress: function (e) {
-      if (this.suppressKeyPressRepeat) return
-      this.move(e)
-    }
-
-  , keyup: function (e) {
-      switch(e.keyCode) {
-        case 40: // down arrow
-        case 38: // up arrow
-        case 16: // shift
-        case 17: // ctrl
-        case 18: // alt
-          break
-
-        case 9: // tab
-        case 13: // enter
-          if (!this.shown) return
-          this.select()
-          break
-
-        case 27: // escape
-          if (!this.shown) return
-          this.hide()
-          break
-
-        default:
-          this.lookup()
-      }
-
-      e.stopPropagation()
-      e.preventDefault()
-  }
-
-  , focus: function (e) {
-      this.focused = true
-    }
-
-  , blur: function (e) {
-      this.focused = false
-      if (!this.mousedover && this.shown) this.hide()
-    }
-
-  , click: function (e) {
-      e.stopPropagation()
-      e.preventDefault()
-      this.select()
-      this.$element.focus()
-    }
-
-  , mouseenter: function (e) {
-      this.mousedover = true
-      this.$menu.find('.active').removeClass('active')
-      $(e.currentTarget).addClass('active')
-    }
-
-  , mouseleave: function (e) {
-      this.mousedover = false
-      if (!this.focused && this.shown) this.hide()
-    }
-
-  }
-
-
-  /* TYPEAHEAD PLUGIN DEFINITION
-   * =========================== */
-
-  var old = $.fn.typeahead
-
-  $.fn.typeahead = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('typeahead')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('typeahead', (data = new Typeahead(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.typeahead.defaults = {
-    source: []
-  , items: 8
-  , menu: '<ul class="typeahead dropdown-menu"></ul>'
-  , item: '<li><a href="#"></a></li>'
-  , minLength: 1
+    this.checkPosition()
   }
 
-  $.fn.typeahead.Constructor = Typeahead
-
-
- /* TYPEAHEAD NO CONFLICT
-  * =================== */
+  Affix.RESET = 'affix affix-top affix-bottom'
 
-  $.fn.typeahead.noConflict = function () {
-    $.fn.typeahead = old
-    return this
+  Affix.DEFAULTS = {
+    offset: 0
   }
 
-
- /* TYPEAHEAD DATA-API
-  * ================== */
-
-  $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
-    var $this = $(this)
-    if ($this.data('typeahead')) return
-    $this.typeahead($this.data())
-  })
-
-}(window.jQuery);
-/* ==========================================================
- * bootstrap-affix.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#affix
- * ==========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* AFFIX CLASS DEFINITION
-  * ====================== */
-
-  var Affix = function (element, options) {
-    this.options = $.extend({}, $.fn.affix.defaults, options)
-    this.$window = $(window)
-      .on('scroll.affix.data-api', $.proxy(this.checkPosition, this))
-      .on('click.affix.data-api',  $.proxy(function () { setTimeout($.proxy(this.checkPosition, this), 1) }, this))
-    this.$element = $(element)
-    this.checkPosition()
+  Affix.prototype.checkPositionWithEventLoop = function () {
+    setTimeout($.proxy(this.checkPosition, this), 1)
   }
 
   Affix.prototype.checkPosition = function () {
     if (!this.$element.is(':visible')) return
 
     var scrollHeight = $(document).height()
-      , scrollTop = this.$window.scrollTop()
-      , position = this.$element.offset()
-      , offset = this.options.offset
-      , offsetBottom = offset.bottom
-      , offsetTop = offset.top
-      , reset = 'affix affix-top affix-bottom'
-      , affix
-
-    if (typeof offset != 'object') offsetBottom = offsetTop = offset
-    if (typeof offsetTop == 'function') offsetTop = offset.top()
+    var scrollTop    = this.$window.scrollTop()
+    var position     = this.$element.offset()
+    var offset       = this.options.offset
+    var offsetTop    = offset.top
+    var offsetBottom = offset.bottom
+
+    if (typeof offset != 'object')         offsetBottom = offsetTop = offset
+    if (typeof offsetTop == 'function')    offsetTop    = offset.top()
     if (typeof offsetBottom == 'function') offsetBottom = offset.bottom()
 
-    affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ?
-      false    : offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ?
-      'bottom' : offsetTop != null && scrollTop <= offsetTop ?
-      'top'    : false
+    var affix = this.unpin   != null && (scrollTop + this.unpin <= position.top) ? false :
+                offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? 'bottom' :
+                offsetTop    != null && (scrollTop <= offsetTop) ? 'top' : false
 
     if (this.affixed === affix) return
+    if (this.unpin) this.$element.css('top', '')
 
     this.affixed = affix
-    this.unpin = affix == 'bottom' ? position.top - scrollTop : null
+    this.unpin   = affix == 'bottom' ? position.top - scrollTop : null
+
+    this.$element.removeClass(Affix.RESET).addClass('affix' + (affix ? '-' + affix : ''))
 
-    this.$element.removeClass(reset).addClass('affix' + (affix ? '-' + affix : ''))
+    if (affix == 'bottom') {
+      this.$element.offset({ top: document.body.offsetHeight - offsetBottom - this.$element.height() })
+    }
   }
 
 
- /* AFFIX PLUGIN DEFINITION
-  * ======================= */
+  // AFFIX PLUGIN DEFINITION
+  // =======================
 
   var old = $.fn.affix
 
   $.fn.affix = function (option) {
     return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('affix')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('affix', (data = new Affix(this, options)))
+      var $this   = $(this)
+      var data    = $this.data('bs.affix')
+      var options = typeof option == 'object' && option
+
+      if (!data) $this.data('bs.affix', (data = new Affix(this, options)))
       if (typeof option == 'string') data[option]()
     })
   }
 
   $.fn.affix.Constructor = Affix
 
-  $.fn.affix.defaults = {
-    offset: 0
-  }
 
-
- /* AFFIX NO CONFLICT
-  * ================= */
+  // AFFIX NO CONFLICT
+  // =================
 
   $.fn.affix.noConflict = function () {
     $.fn.affix = old
@@ -2255,22 +1986,21 @@
   }
 
 
- /* AFFIX DATA-API
-  * ============== */
+  // AFFIX DATA-API
+  // ==============
 
   $(window).on('load', function () {
     $('[data-spy="affix"]').each(function () {
       var $spy = $(this)
-        , data = $spy.data()
+      var data = $spy.data()
 
       data.offset = data.offset || {}
 
-      data.offsetBottom && (data.offset.bottom = data.offsetBottom)
-      data.offsetTop && (data.offset.top = data.offsetTop)
+      if (data.offsetBottom) data.offset.bottom = data.offsetBottom
+      if (data.offsetTop)    data.offset.top    = data.offsetTop
 
       $spy.affix(data)
     })
   })
 
-
-}(window.jQuery);
\ No newline at end of file
+}(jQuery);
diff --git a/shared/vendor/js/jquery-plugins/jquery.spectrum.js b/shared/vendor/js/jquery-plugins/jquery.spectrum.js
index 0a52289ff88..9d111a20e65 100644
--- a/shared/vendor/js/jquery-plugins/jquery.spectrum.js
+++ b/shared/vendor/js/jquery-plugins/jquery.spectrum.js
@@ -1,8 +1,8 @@
-// Spectrum Colorpicker v1.0.9
+// Spectrum Colorpicker v1.3.0
 // https://github.com/bgrins/spectrum
 // Author: Brian Grinstead
 // License: MIT
-define(['jquery'], function (jQuery) {
+
 (function (window, $, undefined) {
     var defaultOpts = {
 
@@ -17,6 +17,7 @@ define(['jquery'], function (jQuery) {
         color: false,
         flat: false,
         showInput: false,
+        allowEmpty: false,
         showButtons: true,
         clickoutFiresChange: false,
         showInitial: false,
@@ -24,9 +25,11 @@ define(['jquery'], function (jQuery) {
         showPaletteOnly: false,
         showSelectionPalette: true,
         localStorageKey: false,
+        appendTo: "body",
         maxSelectionSize: 7,
         cancelText: "cancel",
         chooseText: "choose",
+        clearText: "Clear Color Selection",
         preferredFormat: false,
         className: "",
         showAlpha: false,
@@ -47,6 +50,10 @@ define(['jquery'], function (jQuery) {
         style.cssText = 'background-color:rgba(0,0,0,.5)';
         return contains(style.backgroundColor, 'rgba') || contains(style.backgroundColor, 'hsla');
     })(),
+    inputTypeColorSupport = (function() {
+        var colorInput = $("<input type='color' value='!' />")[0];
+        return colorInput.type === "color" && colorInput.value !== "!";
+    })(),
     replaceInput = [
         "<div class='sp-replacer'>",
             "<div class='sp-preview'><div class='sp-preview-inner'></div></div>",
@@ -80,6 +87,8 @@ define(['jquery'], function (jQuery) {
                                     "</div>",
                                 "</div>",
                             "</div>",
+                            "<div class='sp-clear sp-clear-display'>",
+                            "</div>",
                             "<div class='sp-hue'>",
                                 "<div class='sp-slider'></div>",
                                 gradientFix,
@@ -103,12 +112,18 @@ define(['jquery'], function (jQuery) {
     function paletteTemplate (p, color, className) {
         var html = [];
         for (var i = 0; i < p.length; i++) {
-            var tiny = tinycolor(p[i]);
-            var c = tiny.toHsl().l < 0.5 ? "sp-thumb-el sp-thumb-dark" : "sp-thumb-el sp-thumb-light";
-            c += (tinycolor.equals(color, p[i])) ? " sp-thumb-active" : "";
-
-            var swatchStyle = rgbaSupport ? ("background-color:" + tiny.toRgbString()) : "filter:" + tiny.toFilter();
-            html.push('<span title="' + tiny.toRgbString() + '" data-color="' + tiny.toRgbString() + '" class="' + c + '"><span class="sp-thumb-inner" style="' + swatchStyle + ';" /></span>');
+            var current = p[i];
+            if(current) {
+                var tiny = tinycolor(current);
+                var c = tiny.toHsl().l < 0.5 ? "sp-thumb-el sp-thumb-dark" : "sp-thumb-el sp-thumb-light";
+                c += (tinycolor.equals(color, current)) ? " sp-thumb-active" : "";
+
+                var swatchStyle = rgbaSupport ? ("background-color:" + tiny.toRgbString()) : "filter:" + tiny.toFilter();
+                html.push('<span title="' + tiny.toRgbString() + '" data-color="' + tiny.toRgbString() + '" class="' + c + '"><span class="sp-thumb-inner" style="' + swatchStyle + ';" /></span>');
+            } else {
+                var cls = 'sp-clear-display';
+                html.push('<span title="No Color Selected" data-color="" style="background-color:transparent;" class="' + cls + '"></span>');
+            }
         }
         return "<div class='sp-cf " + className + "'>" + html.join('') + "</div>";
     }
@@ -156,11 +171,12 @@ define(['jquery'], function (jQuery) {
             currentSaturation = 0,
             currentValue = 0,
             currentAlpha = 1,
-            palette = opts.palette.slice(0),
-            paletteArray = $.isArray(palette[0]) ? palette : [palette],
+            palette = [],
+            paletteArray = [],
             selectionPalette = opts.selectionPalette.slice(0),
             maxSelectionSize = opts.maxSelectionSize,
-            draggingClass = "sp-dragging";
+            draggingClass = "sp-dragging",
+            shiftMovementDirection = null;
 
         var doc = element.ownerDocument,
             body = doc.body,
@@ -178,25 +194,38 @@ define(['jquery'], function (jQuery) {
             paletteContainer = container.find(".sp-palette"),
             initialColorContainer = container.find(".sp-initial"),
             cancelButton = container.find(".sp-cancel"),
+            clearButton = container.find(".sp-clear"),
             chooseButton = container.find(".sp-choose"),
             isInput = boundElement.is("input"),
+            isInputTypeColor = isInput && inputTypeColorSupport && boundElement.attr("type") === "color",
             shouldReplace = isInput && !flat,
-            replacer = (shouldReplace) ? $(replaceInput).addClass(theme) : $([]),
+            replacer = (shouldReplace) ? $(replaceInput).addClass(theme).addClass(opts.className) : $([]),
             offsetElement = (shouldReplace) ? replacer : boundElement,
             previewElement = replacer.find(".sp-preview-inner"),
             initialColor = opts.color || (isInput && boundElement.val()),
             colorOnShow = false,
             preferredFormat = opts.preferredFormat,
             currentPreferredFormat = preferredFormat,
-            clickoutFiresChange = !opts.showButtons || opts.clickoutFiresChange;
-
+            clickoutFiresChange = !opts.showButtons || opts.clickoutFiresChange,
+            isEmpty = !initialColor,
+            allowEmpty = opts.allowEmpty && !isInputTypeColor;
 
         function applyOptions() {
 
+            if (opts.showPaletteOnly) {
+                opts.showPalette = true;
+            }
+
+            if (opts.palette) {
+                palette = opts.palette.slice(0);
+                paletteArray = $.isArray(palette[0]) ? palette : [palette];
+            }
+
             container.toggleClass("sp-flat", flat);
             container.toggleClass("sp-input-disabled", !opts.showInput);
             container.toggleClass("sp-alpha-enabled", opts.showAlpha);
-            container.toggleClass("sp-buttons-disabled", !opts.showButtons || flat);
+            container.toggleClass("sp-clear-enabled", allowEmpty);
+            container.toggleClass("sp-buttons-disabled", !opts.showButtons);
             container.toggleClass("sp-palette-disabled", !opts.showPalette);
             container.toggleClass("sp-palette-only", opts.showPaletteOnly);
             container.toggleClass("sp-initial-disabled", !opts.showInitial);
@@ -214,14 +243,24 @@ define(['jquery'], function (jQuery) {
             applyOptions();
 
             if (shouldReplace) {
-                boundElement.hide().after(replacer);
+                boundElement.after(replacer).hide();
+            }
+
+            if (!allowEmpty) {
+                clearButton.hide();
             }
 
             if (flat) {
                 boundElement.after(container).hide();
             }
             else {
-                $(body).append(container);
+
+                var appendTo = opts.appendTo === "parent" ? boundElement.parent() : $(opts.appendTo);
+                if (appendTo.length !== 1) {
+                    appendTo = $("body");
+                }
+
+                appendTo.append(container);
             }
 
             if (localStorageKey && window.localStorage) {
@@ -277,6 +316,19 @@ define(['jquery'], function (jQuery) {
                 hide("cancel");
             });
 
+            clearButton.attr("title", opts.clearText);
+            clearButton.bind("click.spectrum", function (e) {
+                e.stopPropagation();
+                e.preventDefault();
+                isEmpty = true;
+                move();
+
+                if(flat) {
+                    //for the flat style, this is a change event
+                    updateOriginalInput(true);
+                }
+            });
+
             chooseButton.text(opts.chooseText);
             chooseButton.bind("click.spectrum", function (e) {
                 e.stopPropagation();
@@ -290,22 +342,54 @@ define(['jquery'], function (jQuery) {
 
             draggable(alphaSlider, function (dragX, dragY, e) {
                 currentAlpha = (dragX / alphaWidth);
+                isEmpty = false;
                 if (e.shiftKey) {
                     currentAlpha = Math.round(currentAlpha * 10) / 10;
                 }
 
                 move();
-            });
+            }, dragStart, dragStop);
 
             draggable(slider, function (dragX, dragY) {
                 currentHue = parseFloat(dragY / slideHeight);
+                isEmpty = false;
+                if (!opts.showAlpha) {
+                    currentAlpha = 1;
+                }
                 move();
             }, dragStart, dragStop);
 
-            draggable(dragger, function (dragX, dragY) {
-                currentSaturation = parseFloat(dragX / dragWidth);
-                currentValue = parseFloat((dragHeight - dragY) / dragHeight);
+            draggable(dragger, function (dragX, dragY, e) {
+
+                // shift+drag should snap the movement to either the x or y axis.
+                if (!e.shiftKey) {
+                    shiftMovementDirection = null;
+                }
+                else if (!shiftMovementDirection) {
+                    var oldDragX = currentSaturation * dragWidth;
+                    var oldDragY = dragHeight - (currentValue * dragHeight);
+                    var furtherFromX = Math.abs(dragX - oldDragX) > Math.abs(dragY - oldDragY);
+
+                    shiftMovementDirection = furtherFromX ? "x" : "y";
+                }
+
+                var setSaturation = !shiftMovementDirection || shiftMovementDirection === "x";
+                var setValue = !shiftMovementDirection || shiftMovementDirection === "y";
+
+                if (setSaturation) {
+                    currentSaturation = parseFloat(dragX / dragWidth);
+                }
+                if (setValue) {
+                    currentValue = parseFloat((dragHeight - dragY) / dragHeight);
+                }
+
+                isEmpty = false;
+                if (!opts.showAlpha) {
+                    currentAlpha = 1;
+                }
+
                 move();
+
             }, dragStart, dragStop);
 
             if (!!initialColor) {
@@ -417,23 +501,36 @@ define(['jquery'], function (jQuery) {
         }
 
         function dragStart() {
-            if (dragHeight === 0 || dragWidth === 0 || slideHeight === 0) {
+            if (dragHeight <= 0 || dragWidth <= 0 || slideHeight <= 0) {
                 reflow();
             }
             container.addClass(draggingClass);
+            shiftMovementDirection = null;
+            boundElement.trigger('dragstart.spectrum', [ get() ]);
         }
 
         function dragStop() {
             container.removeClass(draggingClass);
+            boundElement.trigger('dragstop.spectrum', [ get() ]);
         }
 
         function setFromTextInput() {
-            var tiny = tinycolor(textInput.val());
-            if (tiny.ok) {
-                set(tiny);
+
+            var value = textInput.val();
+
+            if ((value === null || value === "") && allowEmpty) {
+                set(null);
+                updateOriginalInput(true);
             }
             else {
-                textInput.addClass("sp-validation-error");
+                var tiny = tinycolor(value);
+                if (tiny.ok) {
+                    set(tiny);
+                    updateOriginalInput(true);
+                }
+                else {
+                    textInput.addClass("sp-validation-error");
+                }
             }
         }
 
@@ -468,9 +565,6 @@ define(['jquery'], function (jQuery) {
             replacer.addClass("sp-active");
             container.removeClass("sp-hidden");
 
-            if (opts.showPalette) {
-                drawPalette();
-            }
             reflow();
             updateUI();
 
@@ -517,26 +611,45 @@ define(['jquery'], function (jQuery) {
 
         function set(color, ignoreFormatChange) {
             if (tinycolor.equals(color, get())) {
+                // Update UI just in case a validation error needs
+                // to be cleared.
+                updateUI();
                 return;
             }
 
-            var newColor = tinycolor(color);
-            var newHsv = newColor.toHsv();
-
-            currentHue = newHsv.h;
-            currentSaturation = newHsv.s;
-            currentValue = newHsv.v;
-            currentAlpha = newHsv.a;
+            var newColor, newHsv;
+            if (!color && allowEmpty) {
+                isEmpty = true;
+            } else {
+                isEmpty = false;
+                newColor = tinycolor(color);
+                newHsv = newColor.toHsv();
 
+                currentHue = (newHsv.h % 360) / 360;
+                currentSaturation = newHsv.s;
+                currentValue = newHsv.v;
+                currentAlpha = newHsv.a;
+            }
             updateUI();
 
-            if (newColor.ok && !ignoreFormatChange) {
+            if (newColor && newColor.ok && !ignoreFormatChange) {
                 currentPreferredFormat = preferredFormat || newColor.format;
             }
         }
 
-        function get() {
-            return tinycolor.fromRatio({ h: currentHue, s: currentSaturation, v: currentValue, a: Math.round(currentAlpha * 100) / 100 });
+        function get(opts) {
+            opts = opts || { };
+
+            if (allowEmpty && isEmpty) {
+                return null;
+            }
+
+            return tinycolor.fromRatio({
+                h: currentHue,
+                s: currentSaturation,
+                v: currentValue,
+                a: Math.round(currentAlpha * 100) / 100
+            }, { format: opts.format || currentPreferredFormat });
         }
 
         function isValid() {
@@ -557,57 +670,64 @@ define(['jquery'], function (jQuery) {
             updateHelperLocations();
 
             // Update dragger background color (gradients take care of saturation and value).
-            var flatColor = tinycolor({ h: currentHue, s: "1.0", v: "1.0" });
+            var flatColor = tinycolor.fromRatio({ h: currentHue, s: 1, v: 1 });
             dragger.css("background-color", flatColor.toHexString());
 
             // Get a format that alpha will be included in (hex and names ignore alpha)
             var format = currentPreferredFormat;
-            if (currentAlpha < 1) {
-                if (format === "hex" || format === "name") {
+            if (currentAlpha < 1 && !(currentAlpha === 0 && format === "name")) {
+                if (format === "hex" || format === "hex3" || format === "hex6" || format === "name") {
                     format = "rgb";
                 }
             }
 
-            var realColor = get(),
-                realHex = realColor.toHexString(),
-                realRgb = realColor.toRgbString();
+            var realColor = get({ format: format }),
+                displayColor = '';
 
+             //reset background info for preview element
+            previewElement.removeClass("sp-clear-display");
+            previewElement.css('background-color', 'transparent');
 
-            // Update the replaced elements background color (with actual selected color)
-            if (rgbaSupport || realColor.alpha === 1) {
-                previewElement.css("background-color", realRgb);
+            if (!realColor && allowEmpty) {
+                // Update the replaced elements background with icon indicating no color selection
+                previewElement.addClass("sp-clear-display");
             }
             else {
-                previewElement.css("background-color", "transparent");
-                previewElement.css("filter", realColor.toFilter());
-            }
+                var realHex = realColor.toHexString(),
+                    realRgb = realColor.toRgbString();
 
-            if (opts.showAlpha) {
-                var rgb = realColor.toRgb();
-                rgb.a = 0;
-                var realAlpha = tinycolor(rgb).toRgbString();
-                var gradient = "linear-gradient(left, " + realAlpha + ", " + realHex + ")";
-
-                if (IE) {
-                    alphaSliderInner.css("filter", tinycolor(realAlpha).toFilter({ gradientType: 1 }, realHex));
+                // Update the replaced elements background color (with actual selected color)
+                if (rgbaSupport || realColor.alpha === 1) {
+                    previewElement.css("background-color", realRgb);
                 }
                 else {
-                    alphaSliderInner.css("background", "-webkit-" + gradient);
-                    alphaSliderInner.css("background", "-moz-" + gradient);
-                    alphaSliderInner.css("background", "-ms-" + gradient);
-                    alphaSliderInner.css("background", gradient);
+                    previewElement.css("background-color", "transparent");
+                    previewElement.css("filter", realColor.toFilter());
                 }
-            }
 
+                if (opts.showAlpha) {
+                    var rgb = realColor.toRgb();
+                    rgb.a = 0;
+                    var realAlpha = tinycolor(rgb).toRgbString();
+                    var gradient = "linear-gradient(left, " + realAlpha + ", " + realHex + ")";
 
-            // Update the text entry input as it changes happen
-            if (opts.showInput) {
-                if (currentAlpha < 1) {
-                    if (format === "hex" || format === "name") {
-                        format = "rgb";
+                    if (IE) {
+                        alphaSliderInner.css("filter", tinycolor(realAlpha).toFilter({ gradientType: 1 }, realHex));
+                    }
+                    else {
+                        alphaSliderInner.css("background", "-webkit-" + gradient);
+                        alphaSliderInner.css("background", "-moz-" + gradient);
+                        alphaSliderInner.css("background", "-ms-" + gradient);
+                        alphaSliderInner.css("background", gradient);
                     }
                 }
-                textInput.val(realColor.toString(format));
+
+                displayColor = realColor.toString(format);
+            }
+
+            // Update the text entry input as it changes happen
+            if (opts.showInput) {
+                textInput.val(displayColor);
             }
 
             if (opts.showPalette) {
@@ -621,49 +741,67 @@ define(['jquery'], function (jQuery) {
             var s = currentSaturation;
             var v = currentValue;
 
-            // Where to show the little circle in that displays your current selected color
-            var dragX = s * dragWidth;
-            var dragY = dragHeight - (v * dragHeight);
-            dragX = Math.max(
-                -dragHelperHeight,
-                Math.min(dragWidth - dragHelperHeight, dragX - dragHelperHeight)
-            );
-            dragY = Math.max(
-                -dragHelperHeight,
-                Math.min(dragHeight - dragHelperHeight, dragY - dragHelperHeight)
-            );
-            dragHelper.css({
-                "top": dragY,
-                "left": dragX
-            });
-
-            var alphaX = currentAlpha * alphaWidth;
-            alphaSlideHelper.css({
-                "left": alphaX - (alphaSlideHelperWidth / 2)
-            });
-
-            // Where to show the bar that displays your current selected hue
-            var slideY = (currentHue) * slideHeight;
-            slideHelper.css({
-                "top": slideY - slideHelperHeight
-            });
+            if(allowEmpty && isEmpty) {
+                //if selected color is empty, hide the helpers
+                alphaSlideHelper.hide();
+                slideHelper.hide();
+                dragHelper.hide();
+            }
+            else {
+                //make sure helpers are visible
+                alphaSlideHelper.show();
+                slideHelper.show();
+                dragHelper.show();
+
+                // Where to show the little circle in that displays your current selected color
+                var dragX = s * dragWidth;
+                var dragY = dragHeight - (v * dragHeight);
+                dragX = Math.max(
+                    -dragHelperHeight,
+                    Math.min(dragWidth - dragHelperHeight, dragX - dragHelperHeight)
+                );
+                dragY = Math.max(
+                    -dragHelperHeight,
+                    Math.min(dragHeight - dragHelperHeight, dragY - dragHelperHeight)
+                );
+                dragHelper.css({
+                    "top": dragY + "px",
+                    "left": dragX + "px"
+                });
+
+                var alphaX = currentAlpha * alphaWidth;
+                alphaSlideHelper.css({
+                    "left": (alphaX - (alphaSlideHelperWidth / 2)) + "px"
+                });
+
+                // Where to show the bar that displays your current selected hue
+                var slideY = (currentHue) * slideHeight;
+                slideHelper.css({
+                    "top": (slideY - slideHelperHeight) + "px"
+                });
+            }
         }
 
         function updateOriginalInput(fireCallback) {
-            var color = get();
+            var color = get(),
+                displayColor = '',
+                hasChanged = !tinycolor.equals(color, colorOnShow);
+
+            if (color) {
+                displayColor = color.toString(currentPreferredFormat);
+                // Update the selection palette with the current color
+                addColorToSelectionPalette(color);
+            }
 
             if (isInput) {
-                boundElement.val(color.toString(currentPreferredFormat)).change();
+                boundElement.val(displayColor);
             }
 
-            var hasChanged = !tinycolor.equals(color, colorOnShow);
             colorOnShow = color;
 
-            // Update the selection palette with the current color
-            addColorToSelectionPalette(color);
             if (fireCallback && hasChanged) {
                 callbacks.change(color);
-                boundElement.trigger('change.spectrum', [ color ]);
+                boundElement.trigger('change', [ color ]);
             }
         }
 
@@ -678,10 +816,17 @@ define(['jquery'], function (jQuery) {
             alphaSlideHelperWidth = alphaSlideHelper.width();
 
             if (!flat) {
+                container.css("position", "absolute");
                 container.offset(getOffset(container, offsetElement));
             }
 
             updateHelperLocations();
+
+            if (opts.showPalette) {
+                drawPalette();
+            }
+
+            boundElement.trigger('reflow.spectrum');
         }
 
         function destroy() {
@@ -812,8 +957,8 @@ define(['jquery'], function (jQuery) {
         var duringDragEvents = {};
         duringDragEvents["selectstart"] = prevent;
         duringDragEvents["dragstart"] = prevent;
-        duringDragEvents[(hasTouch ? "touchmove" : "mousemove")] = move;
-        duringDragEvents[(hasTouch ? "touchend" : "mouseup")] = stop;
+        duringDragEvents["touchmove mousemove"] = move;
+        duringDragEvents["touchend mouseup"] = stop;
 
         function prevent(e) {
             if (e.stopPropagation) {
@@ -847,6 +992,7 @@ define(['jquery'], function (jQuery) {
                 onmove.apply(element, [dragX, dragY, e]);
             }
         }
+
         function start(e) {
             var rightclick = (e.which) ? (e.which == 3) : (e.button == 2);
             var touches = e.originalEvent.touches;
@@ -869,6 +1015,7 @@ define(['jquery'], function (jQuery) {
                 }
             }
         }
+
         function stop() {
             if (dragging) {
                 $(doc).unbind(duringDragEvents);
@@ -878,7 +1025,7 @@ define(['jquery'], function (jQuery) {
             dragging = false;
         }
 
-        $(element).bind(hasTouch ? "touchstart" : "mousedown", start);
+        $(element).bind("touchstart mousedown", start);
     }
 
     function throttle(func, wait, debounce) {
@@ -894,6 +1041,7 @@ define(['jquery'], function (jQuery) {
         };
     }
 
+    function log(){/* jshint -W021 */if(window.console){if(Function.prototype.bind)log=Function.prototype.bind.call(console.log,console);else log=function(){Function.prototype.apply.call(console.log,console,arguments);};log.apply(this,arguments);}}
 
     /**
     * Define a jQuery plugin
@@ -909,7 +1057,6 @@ define(['jquery'], function (jQuery) {
             this.each(function () {
                 var spect = spectrums[$(this).data(dataID)];
                 if (spect) {
-
                     var method = spect[opts];
                     if (!method) {
                         throw new Error( "Spectrum: no such method: '" + opts + "'" );
@@ -939,7 +1086,8 @@ define(['jquery'], function (jQuery) {
 
         // Initializing a new instance of spectrum
         return this.spectrum("destroy").each(function () {
-            var spect = spectrum(this, opts);
+            var options = $.extend({}, opts, $(this).data());
+            var spect = spectrum(this, options);
             $(this).data(dataID, spect.id);
         });
     };
@@ -954,805 +1102,926 @@ define(['jquery'], function (jQuery) {
     $.spectrum.palettes = { };
 
     $.fn.spectrum.processNativeColorInputs = function () {
-        var colorInput = $("<input type='color' value='!' />")[0];
-        var supportsColor = colorInput.type === "color" && colorInput.value != "!";
-
-        if (!supportsColor) {
+        if (!inputTypeColorSupport) {
             $("input[type=color]").spectrum({
                 preferredFormat: "hex6"
             });
         }
     };
 
-    // TinyColor.js - <https://github.com/bgrins/TinyColor> - 2011 Brian Grinstead - v0.5
+    // TinyColor v0.9.16
+    // https://github.com/bgrins/TinyColor
+    // 2013-08-10, Brian Grinstead, MIT License
 
-    (function (window) {
+    (function() {
 
-        var trimLeft = /^[\s,#]+/,
+    var trimLeft = /^[\s,#]+/,
         trimRight = /\s+$/,
         tinyCounter = 0,
         math = Math,
         mathRound = math.round,
         mathMin = math.min,
         mathMax = math.max,
-        mathRandom = math.random,
-        parseFloat = window.parseFloat;
+        mathRandom = math.random;
 
-        function tinycolor(color, opts) {
+    function tinycolor (color, opts) {
 
-            // If input is already a tinycolor, return itself
-            if (typeof color == "object" && color.hasOwnProperty("_tc_id")) {
-                return color;
-            }
+        color = (color) ? color : '';
+        opts = opts || { };
 
-            var rgb = inputToRGB(color);
-            var r = rgb.r, g = rgb.g, b = rgb.b, a = parseFloat(rgb.a), format = rgb.format;
-
-            return {
-                ok: rgb.ok,
-                format: format,
-                _tc_id: tinyCounter++,
-                alpha: a,
-                toHsv: function () {
-                    var hsv = rgbToHsv(r, g, b);
-                    return { h: hsv.h, s: hsv.s, v: hsv.v, a: a };
-                },
-                toHsvString: function () {
-                    var hsv = rgbToHsv(r, g, b);
-                    var h = mathRound(hsv.h * 360), s = mathRound(hsv.s * 100), v = mathRound(hsv.v * 100);
-                    return (a == 1) ?
-                  "hsv(" + h + ", " + s + "%, " + v + "%)" :
-                  "hsva(" + h + ", " + s + "%, " + v + "%, " + a + ")";
-                },
-                toHsl: function () {
-                    var hsl = rgbToHsl(r, g, b);
-                    return { h: hsl.h, s: hsl.s, l: hsl.l, a: a };
-                },
-                toHslString: function () {
-                    var hsl = rgbToHsl(r, g, b);
-                    var h = mathRound(hsl.h * 360), s = mathRound(hsl.s * 100), l = mathRound(hsl.l * 100);
-                    return (a == 1) ?
-                  "hsl(" + h + ", " + s + "%, " + l + "%)" :
-                  "hsla(" + h + ", " + s + "%, " + l + "%, " + a + ")";
-                },
-                toHex: function () {
-                    return rgbToHex(r, g, b);
-                },
-                toHexString: function (force6Char) {
-                    return '#' + rgbToHex(r, g, b, force6Char);
-                },
-                toRgb: function () {
-                    return { r: mathRound(r), g: mathRound(g), b: mathRound(b), a: a };
-                },
-                toRgbString: function () {
-                    return (a == 1) ?
-                  "rgb(" + mathRound(r) + ", " + mathRound(g) + ", " + mathRound(b) + ")" :
-                  "rgba(" + mathRound(r) + ", " + mathRound(g) + ", " + mathRound(b) + ", " + a + ")";
-                },
-                toName: function () {
-                    return hexNames[rgbToHex(r, g, b)] || false;
-                },
-                toFilter: function (opts, secondColor) {
-
-                    var hex = rgbToHex(r, g, b, true);
-                    var secondHex = hex;
-                    var alphaHex = Math.round(parseFloat(a) * 255).toString(16);
-                    var secondAlphaHex = alphaHex;
-                    var gradientType = opts && opts.gradientType ? "GradientType = 1, " : "";
-
-                    if (secondColor) {
-                        var s = tinycolor(secondColor);
-                        secondHex = s.toHex();
-                        secondAlphaHex = Math.round(parseFloat(s.alpha) * 255).toString(16);
-                    }
-
-                    return "progid:DXImageTransform.Microsoft.gradient("+gradientType+"startColorstr=#" + pad2(alphaHex) + hex + ",endColorstr=#" + pad2(secondAlphaHex) + secondHex + ")";
-                },
-                toString: function (format) {
-                    format = format || this.format;
-                    var formattedString = false;
-                    if (format === "rgb") {
-                        formattedString = this.toRgbString();
-                    }
-                    if (format === "hex") {
-                        formattedString = this.toHexString();
-                    }
-                    if (format === "hex6") {
-                        formattedString = this.toHexString(true);
-                    }
-                    if (format === "name") {
-                        formattedString = this.toName();
-                    }
-                    if (format === "hsl") {
-                        formattedString = this.toHslString();
-                    }
-                    if (format === "hsv") {
-                        formattedString = this.toHsvString();
-                    }
-
-                    return formattedString || this.toHexString(true);
-                }
-            };
+        // If input is already a tinycolor, return itself
+        if (typeof color == "object" && color.hasOwnProperty("_tc_id")) {
+           return color;
         }
 
-        // If input is an object, force 1 into "1.0" to handle ratios properly
-        // String input requires "1.0" as input, so 1 will be treated as 1
-        tinycolor.fromRatio = function (color) {
-
-            if (typeof color == "object") {
-                for (var i in color) {
-                    if (color[i] === 1) {
-                        color[i] = "1.0";
-                    }
+        var rgb = inputToRGB(color);
+        var r = rgb.r,
+            g = rgb.g,
+            b = rgb.b,
+            a = rgb.a,
+            roundA = mathRound(100*a) / 100,
+            format = opts.format || rgb.format;
+
+        // Don't let the range of [0,255] come back in [0,1].
+        // Potentially lose a little bit of precision here, but will fix issues where
+        // .5 gets interpreted as half of the total, instead of half of 1
+        // If it was supposed to be 128, this was already taken care of by `inputToRgb`
+        if (r < 1) { r = mathRound(r); }
+        if (g < 1) { g = mathRound(g); }
+        if (b < 1) { b = mathRound(b); }
+
+        return {
+            ok: rgb.ok,
+            format: format,
+            _tc_id: tinyCounter++,
+            alpha: a,
+            getAlpha: function() {
+                return a;
+            },
+            setAlpha: function(value) {
+                a = boundAlpha(value);
+                roundA = mathRound(100*a) / 100;
+            },
+            toHsv: function() {
+                var hsv = rgbToHsv(r, g, b);
+                return { h: hsv.h * 360, s: hsv.s, v: hsv.v, a: a };
+            },
+            toHsvString: function() {
+                var hsv = rgbToHsv(r, g, b);
+                var h = mathRound(hsv.h * 360), s = mathRound(hsv.s * 100), v = mathRound(hsv.v * 100);
+                return (a == 1) ?
+                  "hsv("  + h + ", " + s + "%, " + v + "%)" :
+                  "hsva(" + h + ", " + s + "%, " + v + "%, "+ roundA + ")";
+            },
+            toHsl: function() {
+                var hsl = rgbToHsl(r, g, b);
+                return { h: hsl.h * 360, s: hsl.s, l: hsl.l, a: a };
+            },
+            toHslString: function() {
+                var hsl = rgbToHsl(r, g, b);
+                var h = mathRound(hsl.h * 360), s = mathRound(hsl.s * 100), l = mathRound(hsl.l * 100);
+                return (a == 1) ?
+                  "hsl("  + h + ", " + s + "%, " + l + "%)" :
+                  "hsla(" + h + ", " + s + "%, " + l + "%, "+ roundA + ")";
+            },
+            toHex: function(allow3Char) {
+                return rgbToHex(r, g, b, allow3Char);
+            },
+            toHexString: function(allow3Char) {
+                return '#' + rgbToHex(r, g, b, allow3Char);
+            },
+            toRgb: function() {
+                return { r: mathRound(r), g: mathRound(g), b: mathRound(b), a: a };
+            },
+            toRgbString: function() {
+                return (a == 1) ?
+                  "rgb("  + mathRound(r) + ", " + mathRound(g) + ", " + mathRound(b) + ")" :
+                  "rgba(" + mathRound(r) + ", " + mathRound(g) + ", " + mathRound(b) + ", " + roundA + ")";
+            },
+            toPercentageRgb: function() {
+                return { r: mathRound(bound01(r, 255) * 100) + "%", g: mathRound(bound01(g, 255) * 100) + "%", b: mathRound(bound01(b, 255) * 100) + "%", a: a };
+            },
+            toPercentageRgbString: function() {
+                return (a == 1) ?
+                  "rgb("  + mathRound(bound01(r, 255) * 100) + "%, " + mathRound(bound01(g, 255) * 100) + "%, " + mathRound(bound01(b, 255) * 100) + "%)" :
+                  "rgba(" + mathRound(bound01(r, 255) * 100) + "%, " + mathRound(bound01(g, 255) * 100) + "%, " + mathRound(bound01(b, 255) * 100) + "%, " + roundA + ")";
+            },
+            toName: function() {
+                if (a === 0) {
+                    return "transparent";
                 }
-            }
 
-            return tinycolor(color);
+                return hexNames[rgbToHex(r, g, b, true)] || false;
+            },
+            toFilter: function(secondColor) {
+                var hex = rgbToHex(r, g, b);
+                var secondHex = hex;
+                var alphaHex = Math.round(parseFloat(a) * 255).toString(16);
+                var secondAlphaHex = alphaHex;
+                var gradientType = opts && opts.gradientType ? "GradientType = 1, " : "";
+
+                if (secondColor) {
+                    var s = tinycolor(secondColor);
+                    secondHex = s.toHex();
+                    secondAlphaHex = Math.round(parseFloat(s.alpha) * 255).toString(16);
+                }
 
-        };
+                return "progid:DXImageTransform.Microsoft.gradient("+gradientType+"startColorstr=#" + pad2(alphaHex) + hex + ",endColorstr=#" + pad2(secondAlphaHex) + secondHex + ")";
+            },
+            toString: function(format) {
+                var formatSet = !!format;
+                format = format || this.format;
 
-        // Given a string or object, convert that input to RGB
-        // Possible string inputs:
-        //
-        //     "red"
-        //     "#f00" or "f00"
-        //     "#ff0000" or "ff0000"
-        //     "rgb 255 0 0" or "rgb (255, 0, 0)"
-        //     "rgb 1.0 0 0" or "rgb (1, 0, 0)"
-        //     "rgba (255, 0, 0, 1)" or "rgba 255, 0, 0, 1"
-        //     "rgba (1.0, 0, 0, 1)" or "rgba 1.0, 0, 0, 1"
-        //     "hsl(0, 100%, 50%)" or "hsl 0 100% 50%"
-        //     "hsla(0, 100%, 50%, 1)" or "hsla 0 100% 50%, 1"
-        //     "hsv(0, 100%, 100%)" or "hsv 0 100% 100%"
-        //
-        function inputToRGB(color) {
-
-            var rgb = { r: 0, g: 0, b: 0 };
-            var a = 1;
-            var ok = false;
-            var format = false;
-
-            if (typeof color == "string") {
-                color = stringInputToObject(color);
-            }
+                var formattedString = false;
+                var hasAlphaAndFormatNotSet = !formatSet && a < 1 && a > 0;
+                var formatWithAlpha = hasAlphaAndFormatNotSet && (format === "hex" || format === "hex6" || format === "hex3" || format === "name");
 
-            if (typeof color == "object") {
-                if (color.hasOwnProperty("r") && color.hasOwnProperty("g") && color.hasOwnProperty("b")) {
-                    rgb = rgbToRgb(color.r, color.g, color.b);
-                    ok = true;
-                    format = "rgb";
+                if (format === "rgb") {
+                    formattedString = this.toRgbString();
+                }
+                if (format === "prgb") {
+                    formattedString = this.toPercentageRgbString();
                 }
-                else if (color.hasOwnProperty("h") && color.hasOwnProperty("s") && color.hasOwnProperty("v")) {
-                    rgb = hsvToRgb(color.h, color.s, color.v);
-                    ok = true;
-                    format = "hsv";
+                if (format === "hex" || format === "hex6") {
+                    formattedString = this.toHexString();
                 }
-                else if (color.hasOwnProperty("h") && color.hasOwnProperty("s") && color.hasOwnProperty("l")) {
-                    rgb = hslToRgb(color.h, color.s, color.l);
-                    ok = true;
-                    format = "hsl";
+                if (format === "hex3") {
+                    formattedString = this.toHexString(true);
+                }
+                if (format === "name") {
+                    formattedString = this.toName();
+                }
+                if (format === "hsl") {
+                    formattedString = this.toHslString();
+                }
+                if (format === "hsv") {
+                    formattedString = this.toHsvString();
                 }
 
-                if (color.hasOwnProperty("a")) {
-                    a = color.a;
+                if (formatWithAlpha) {
+                    return this.toRgbString();
                 }
+
+                return formattedString || this.toHexString();
             }
+        };
+    }
 
-            rgb.r = mathMin(255, mathMax(rgb.r, 0));
-            rgb.g = mathMin(255, mathMax(rgb.g, 0));
-            rgb.b = mathMin(255, mathMax(rgb.b, 0));
+    // If input is an object, force 1 into "1.0" to handle ratios properly
+    // String input requires "1.0" as input, so 1 will be treated as 1
+    tinycolor.fromRatio = function(color, opts) {
+        if (typeof color == "object") {
+            var newColor = {};
+            for (var i in color) {
+                if (color.hasOwnProperty(i)) {
+                    if (i === "a") {
+                        newColor[i] = color[i];
+                    }
+                    else {
+                        newColor[i] = convertToPercentage(color[i]);
+                    }
+                }
+            }
+            color = newColor;
+        }
 
+        return tinycolor(color, opts);
+    };
 
-            // Don't let the range of [0,255] come back in [0,1].
-            // Potentially lose a little bit of precision here, but will fix issues where
-            // .5 gets interpreted as half of the total, instead of half of 1.
-            // If it was supposed to be 128, this was already taken care of in the conversion function
-            if (rgb.r < 1) { rgb.r = mathRound(rgb.r); }
-            if (rgb.g < 1) { rgb.g = mathRound(rgb.g); }
-            if (rgb.b < 1) { rgb.b = mathRound(rgb.b); }
+    // Given a string or object, convert that input to RGB
+    // Possible string inputs:
+    //
+    //     "red"
+    //     "#f00" or "f00"
+    //     "#ff0000" or "ff0000"
+    //     "rgb 255 0 0" or "rgb (255, 0, 0)"
+    //     "rgb 1.0 0 0" or "rgb (1, 0, 0)"
+    //     "rgba (255, 0, 0, 1)" or "rgba 255, 0, 0, 1"
+    //     "rgba (1.0, 0, 0, 1)" or "rgba 1.0, 0, 0, 1"
+    //     "hsl(0, 100%, 50%)" or "hsl 0 100% 50%"
+    //     "hsla(0, 100%, 50%, 1)" or "hsla 0 100% 50%, 1"
+    //     "hsv(0, 100%, 100%)" or "hsv 0 100% 100%"
+    //
+    function inputToRGB(color) {
+
+        var rgb = { r: 0, g: 0, b: 0 };
+        var a = 1;
+        var ok = false;
+        var format = false;
+
+        if (typeof color == "string") {
+            color = stringInputToObject(color);
+        }
 
-            return {
-                ok: ok,
-                format: (color && color.format) || format,
-                r: rgb.r,
-                g: rgb.g,
-                b: rgb.b,
-                a: a
-            };
+        if (typeof color == "object") {
+            if (color.hasOwnProperty("r") && color.hasOwnProperty("g") && color.hasOwnProperty("b")) {
+                rgb = rgbToRgb(color.r, color.g, color.b);
+                ok = true;
+                format = String(color.r).substr(-1) === "%" ? "prgb" : "rgb";
+            }
+            else if (color.hasOwnProperty("h") && color.hasOwnProperty("s") && color.hasOwnProperty("v")) {
+                color.s = convertToPercentage(color.s);
+                color.v = convertToPercentage(color.v);
+                rgb = hsvToRgb(color.h, color.s, color.v);
+                ok = true;
+                format = "hsv";
+            }
+            else if (color.hasOwnProperty("h") && color.hasOwnProperty("s") && color.hasOwnProperty("l")) {
+                color.s = convertToPercentage(color.s);
+                color.l = convertToPercentage(color.l);
+                rgb = hslToRgb(color.h, color.s, color.l);
+                ok = true;
+                format = "hsl";
+            }
+
+            if (color.hasOwnProperty("a")) {
+                a = color.a;
+            }
         }
 
+        a = boundAlpha(a);
 
+        return {
+            ok: ok,
+            format: color.format || format,
+            r: mathMin(255, mathMax(rgb.r, 0)),
+            g: mathMin(255, mathMax(rgb.g, 0)),
+            b: mathMin(255, mathMax(rgb.b, 0)),
+            a: a
+        };
+    }
 
-        // Conversion Functions
-        // --------------------
 
-        // `rgbToHsl`, `rgbToHsv`, `hslToRgb`, `hsvToRgb` modified from:
-        // <http://mjijackson.com/2008/02/rgb-to-hsl-and-rgb-to-hsv-color-model-conversion-algorithms-in-javascript>
+    // Conversion Functions
+    // --------------------
 
-        // `rgbToRgb`
-        // Handle bounds / percentage checking to conform to CSS color spec
-        // <http://www.w3.org/TR/css3-color/>
-        // *Assumes:* r, g, b in [0, 255] or [0, 1]
-        // *Returns:* { r, g, b } in [0, 255]
-        function rgbToRgb(r, g, b) {
-            return {
-                r: bound01(r, 255) * 255,
-                g: bound01(g, 255) * 255,
-                b: bound01(b, 255) * 255
-            };
-        }
+    // `rgbToHsl`, `rgbToHsv`, `hslToRgb`, `hsvToRgb` modified from:
+    // <http://mjijackson.com/2008/02/rgb-to-hsl-and-rgb-to-hsv-color-model-conversion-algorithms-in-javascript>
 
-        // `rgbToHsl`
-        // Converts an RGB color value to HSL.
-        // *Assumes:* r, g, and b are contained in [0, 255] or [0, 1]
-        // *Returns:* { h, s, l } in [0,1]
-        function rgbToHsl(r, g, b) {
+    // `rgbToRgb`
+    // Handle bounds / percentage checking to conform to CSS color spec
+    // <http://www.w3.org/TR/css3-color/>
+    // *Assumes:* r, g, b in [0, 255] or [0, 1]
+    // *Returns:* { r, g, b } in [0, 255]
+    function rgbToRgb(r, g, b){
+        return {
+            r: bound01(r, 255) * 255,
+            g: bound01(g, 255) * 255,
+            b: bound01(b, 255) * 255
+        };
+    }
 
-            r = bound01(r, 255);
-            g = bound01(g, 255);
-            b = bound01(b, 255);
+    // `rgbToHsl`
+    // Converts an RGB color value to HSL.
+    // *Assumes:* r, g, and b are contained in [0, 255] or [0, 1]
+    // *Returns:* { h, s, l } in [0,1]
+    function rgbToHsl(r, g, b) {
 
-            var max = mathMax(r, g, b), min = mathMin(r, g, b);
-            var h, s, l = (max + min) / 2;
+        r = bound01(r, 255);
+        g = bound01(g, 255);
+        b = bound01(b, 255);
 
-            if (max == min) {
-                h = s = 0; // achromatic
-            }
-            else {
-                var d = max - min;
-                s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
-                switch (max) {
-                    case r: h = (g - b) / d + (g < b ? 6 : 0); break;
-                    case g: h = (b - r) / d + 2; break;
-                    case b: h = (r - g) / d + 4; break;
-                }
+        var max = mathMax(r, g, b), min = mathMin(r, g, b);
+        var h, s, l = (max + min) / 2;
 
-                h /= 6;
+        if(max == min) {
+            h = s = 0; // achromatic
+        }
+        else {
+            var d = max - min;
+            s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
+            switch(max) {
+                case r: h = (g - b) / d + (g < b ? 6 : 0); break;
+                case g: h = (b - r) / d + 2; break;
+                case b: h = (r - g) / d + 4; break;
             }
 
-            return { h: h, s: s, l: l };
+            h /= 6;
         }
 
-        // `hslToRgb`
-        // Converts an HSL color value to RGB.
-        // *Assumes:* h is contained in [0, 1] or [0, 360] and s and l are contained [0, 1] or [0, 100]
-        // *Returns:* { r, g, b } in the set [0, 255]
-        function hslToRgb(h, s, l) {
-            var r, g, b;
-
-            h = bound01(h, 360);
-            s = bound01(s, 100);
-            l = bound01(l, 100);
-
-            function hue2rgb(p, q, t) {
-                if (t < 0) t += 1;
-                if (t > 1) t -= 1;
-                if (t < 1 / 6) return p + (q - p) * 6 * t;
-                if (t < 1 / 2) return q;
-                if (t < 2 / 3) return p + (q - p) * (2 / 3 - t) * 6;
-                return p;
-            }
+        return { h: h, s: s, l: l };
+    }
 
-            if (s === 0) {
-                r = g = b = l; // achromatic
-            }
-            else {
-                var q = l < 0.5 ? l * (1 + s) : l + s - l * s;
-                var p = 2 * l - q;
-                r = hue2rgb(p, q, h + 1 / 3);
-                g = hue2rgb(p, q, h);
-                b = hue2rgb(p, q, h - 1 / 3);
-            }
+    // `hslToRgb`
+    // Converts an HSL color value to RGB.
+    // *Assumes:* h is contained in [0, 1] or [0, 360] and s and l are contained [0, 1] or [0, 100]
+    // *Returns:* { r, g, b } in the set [0, 255]
+    function hslToRgb(h, s, l) {
+        var r, g, b;
+
+        h = bound01(h, 360);
+        s = bound01(s, 100);
+        l = bound01(l, 100);
+
+        function hue2rgb(p, q, t) {
+            if(t < 0) t += 1;
+            if(t > 1) t -= 1;
+            if(t < 1/6) return p + (q - p) * 6 * t;
+            if(t < 1/2) return q;
+            if(t < 2/3) return p + (q - p) * (2/3 - t) * 6;
+            return p;
+        }
 
-            return { r: r * 255, g: g * 255, b: b * 255 };
+        if(s === 0) {
+            r = g = b = l; // achromatic
+        }
+        else {
+            var q = l < 0.5 ? l * (1 + s) : l + s - l * s;
+            var p = 2 * l - q;
+            r = hue2rgb(p, q, h + 1/3);
+            g = hue2rgb(p, q, h);
+            b = hue2rgb(p, q, h - 1/3);
         }
 
-        // `rgbToHsv`
-        // Converts an RGB color value to HSV
-        // *Assumes:* r, g, and b are contained in the set [0, 255] or [0, 1]
-        // *Returns:* { h, s, v } in [0,1]
-        function rgbToHsv(r, g, b) {
+        return { r: r * 255, g: g * 255, b: b * 255 };
+    }
 
-            r = bound01(r, 255);
-            g = bound01(g, 255);
-            b = bound01(b, 255);
+    // `rgbToHsv`
+    // Converts an RGB color value to HSV
+    // *Assumes:* r, g, and b are contained in the set [0, 255] or [0, 1]
+    // *Returns:* { h, s, v } in [0,1]
+    function rgbToHsv(r, g, b) {
 
-            var max = mathMax(r, g, b), min = mathMin(r, g, b);
-            var h, s, v = max;
+        r = bound01(r, 255);
+        g = bound01(g, 255);
+        b = bound01(b, 255);
 
-            var d = max - min;
-            s = max === 0 ? 0 : d / max;
+        var max = mathMax(r, g, b), min = mathMin(r, g, b);
+        var h, s, v = max;
 
-            if (max == min) {
-                h = 0; // achromatic
-            }
-            else {
-                switch (max) {
-                    case r: h = (g - b) / d + (g < b ? 6 : 0); break;
-                    case g: h = (b - r) / d + 2; break;
-                    case b: h = (r - g) / d + 4; break;
-                }
-                h /= 6;
-            }
-            return { h: h, s: s, v: v };
-        }
-
-        // `hsvToRgb`
-        // Converts an HSV color value to RGB.
-        // *Assumes:* h is contained in [0, 1] or [0, 360] and s and v are contained in [0, 1] or [0, 100]
-        // *Returns:* { r, g, b } in the set [0, 255]
-        function hsvToRgb(h, s, v) {
-            h = bound01(h, 360) * 6;
-            s = bound01(s, 100);
-            v = bound01(v, 100);
-
-            var i = math.floor(h),
-                f = h - i,
-                p = v * (1 - s),
-                q = v * (1 - f * s),
-                t = v * (1 - (1 - f) * s),
-                mod = i % 6,
-                r = [v, q, p, p, t, v][mod],
-                g = [t, v, v, q, p, p][mod],
-                b = [p, p, t, v, v, q][mod];
-
-            return { r: r * 255, g: g * 255, b: b * 255 };
-        }
-
-        // `rgbToHex`
-        // Converts an RGB color to hex
-        // Assumes r, g, and b are contained in the set [0, 255]
-        // Returns a 3 or 6 character hex
-        function rgbToHex(r, g, b, force6Char) {
-
-            var hex = [
-                pad2(mathRound(r).toString(16)),
-                pad2(mathRound(g).toString(16)),
-                pad2(mathRound(b).toString(16))
-            ];
-
-            // Return a 3 character hex if possible
-            if (!force6Char && hex[0].charAt(0) == hex[0].charAt(1) && hex[1].charAt(0) == hex[1].charAt(1) && hex[2].charAt(0) == hex[2].charAt(1)) {
-                return hex[0].charAt(0) + hex[1].charAt(0) + hex[2].charAt(0);
+        var d = max - min;
+        s = max === 0 ? 0 : d / max;
+
+        if(max == min) {
+            h = 0; // achromatic
+        }
+        else {
+            switch(max) {
+                case r: h = (g - b) / d + (g < b ? 6 : 0); break;
+                case g: h = (b - r) / d + 2; break;
+                case b: h = (r - g) / d + 4; break;
             }
+            h /= 6;
+        }
+        return { h: h, s: s, v: v };
+    }
 
-            return hex.join("");
+    // `hsvToRgb`
+    // Converts an HSV color value to RGB.
+    // *Assumes:* h is contained in [0, 1] or [0, 360] and s and v are contained in [0, 1] or [0, 100]
+    // *Returns:* { r, g, b } in the set [0, 255]
+     function hsvToRgb(h, s, v) {
+
+        h = bound01(h, 360) * 6;
+        s = bound01(s, 100);
+        v = bound01(v, 100);
+
+        var i = math.floor(h),
+            f = h - i,
+            p = v * (1 - s),
+            q = v * (1 - f * s),
+            t = v * (1 - (1 - f) * s),
+            mod = i % 6,
+            r = [v, q, p, p, t, v][mod],
+            g = [t, v, v, q, p, p][mod],
+            b = [p, p, t, v, v, q][mod];
+
+        return { r: r * 255, g: g * 255, b: b * 255 };
+    }
+
+    // `rgbToHex`
+    // Converts an RGB color to hex
+    // Assumes r, g, and b are contained in the set [0, 255]
+    // Returns a 3 or 6 character hex
+    function rgbToHex(r, g, b, allow3Char) {
+
+        var hex = [
+            pad2(mathRound(r).toString(16)),
+            pad2(mathRound(g).toString(16)),
+            pad2(mathRound(b).toString(16))
+        ];
+
+        // Return a 3 character hex if possible
+        if (allow3Char && hex[0].charAt(0) == hex[0].charAt(1) && hex[1].charAt(0) == hex[1].charAt(1) && hex[2].charAt(0) == hex[2].charAt(1)) {
+            return hex[0].charAt(0) + hex[1].charAt(0) + hex[2].charAt(0);
         }
 
-        // `equals`
-        // Can be called with any tinycolor input
-        tinycolor.equals = function (color1, color2) {
-            if (!color1 || !color2) { return false; }
-            return tinycolor(color1).toRgbString() == tinycolor(color2).toRgbString();
-        };
-        tinycolor.random = function () {
-            return tinycolor.fromRatio({
-                r: mathRandom(),
-                g: mathRandom(),
-                b: mathRandom()
-            });
-        };
+        return hex.join("");
+    }
 
+    // `equals`
+    // Can be called with any tinycolor input
+    tinycolor.equals = function (color1, color2) {
+        if (!color1 || !color2) { return false; }
+        return tinycolor(color1).toRgbString() == tinycolor(color2).toRgbString();
+    };
+    tinycolor.random = function() {
+        return tinycolor.fromRatio({
+            r: mathRandom(),
+            g: mathRandom(),
+            b: mathRandom()
+        });
+    };
 
-        // Modification Functions
-        // ----------------------
-        // Thanks to less.js for some of the basics here
-        // <https://github.com/cloudhead/less.js/blob/master/lib/less/functions.js>
 
+    // Modification Functions
+    // ----------------------
+    // Thanks to less.js for some of the basics here
+    // <https://github.com/cloudhead/less.js/blob/master/lib/less/functions.js>
 
-        tinycolor.desaturate = function (color, amount) {
-            var hsl = tinycolor(color).toHsl();
-            hsl.s -= ((amount || 10) / 100);
-            hsl.s = clamp01(hsl.s);
-            return tinycolor(hsl);
-        };
-        tinycolor.saturate = function (color, amount) {
-            var hsl = tinycolor(color).toHsl();
-            hsl.s += ((amount || 10) / 100);
-            hsl.s = clamp01(hsl.s);
-            return tinycolor(hsl);
-        };
-        tinycolor.greyscale = function (color) {
-            return tinycolor.desaturate(color, 100);
-        };
-        tinycolor.lighten = function (color, amount) {
-            var hsl = tinycolor(color).toHsl();
-            hsl.l += ((amount || 10) / 100);
-            hsl.l = clamp01(hsl.l);
-            return tinycolor(hsl);
-        };
-        tinycolor.darken = function (color, amount) {
-            var hsl = tinycolor(color).toHsl();
-            hsl.l -= ((amount || 10) / 100);
-            hsl.l = clamp01(hsl.l);
-            return tinycolor(hsl);
-        };
-        tinycolor.complement = function (color) {
-            var hsl = tinycolor(color).toHsl();
-            hsl.h = (hsl.h + 0.5) % 1;
-            return tinycolor(hsl);
-        };
+    tinycolor.desaturate = function (color, amount) {
+        amount = (amount === 0) ? 0 : (amount || 10);
+        var hsl = tinycolor(color).toHsl();
+        hsl.s -= amount / 100;
+        hsl.s = clamp01(hsl.s);
+        return tinycolor(hsl);
+    };
+    tinycolor.saturate = function (color, amount) {
+        amount = (amount === 0) ? 0 : (amount || 10);
+        var hsl = tinycolor(color).toHsl();
+        hsl.s += amount / 100;
+        hsl.s = clamp01(hsl.s);
+        return tinycolor(hsl);
+    };
+    tinycolor.greyscale = function(color) {
+        return tinycolor.desaturate(color, 100);
+    };
+    tinycolor.lighten = function(color, amount) {
+        amount = (amount === 0) ? 0 : (amount || 10);
+        var hsl = tinycolor(color).toHsl();
+        hsl.l += amount / 100;
+        hsl.l = clamp01(hsl.l);
+        return tinycolor(hsl);
+    };
+    tinycolor.darken = function (color, amount) {
+        amount = (amount === 0) ? 0 : (amount || 10);
+        var hsl = tinycolor(color).toHsl();
+        hsl.l -= amount / 100;
+        hsl.l = clamp01(hsl.l);
+        return tinycolor(hsl);
+    };
+    tinycolor.complement = function(color) {
+        var hsl = tinycolor(color).toHsl();
+        hsl.h = (hsl.h + 180) % 360;
+        return tinycolor(hsl);
+    };
 
 
-        // Combination Functions
-        // ---------------------
-        // Thanks to jQuery xColor for some of the ideas behind these
-        // <https://github.com/infusion/jQuery-xcolor/blob/master/jquery.xcolor.js>
+    // Combination Functions
+    // ---------------------
+    // Thanks to jQuery xColor for some of the ideas behind these
+    // <https://github.com/infusion/jQuery-xcolor/blob/master/jquery.xcolor.js>
 
-        tinycolor.triad = function (color) {
-            var hsl = tinycolor(color).toHsl();
-            var h = hsl.h * 360;
-            return [
+    tinycolor.triad = function(color) {
+        var hsl = tinycolor(color).toHsl();
+        var h = hsl.h;
+        return [
             tinycolor(color),
             tinycolor({ h: (h + 120) % 360, s: hsl.s, l: hsl.l }),
             tinycolor({ h: (h + 240) % 360, s: hsl.s, l: hsl.l })
         ];
-        };
-        tinycolor.tetrad = function (color) {
-            var hsl = tinycolor(color).toHsl();
-            var h = hsl.h * 360;
-            return [
+    };
+    tinycolor.tetrad = function(color) {
+        var hsl = tinycolor(color).toHsl();
+        var h = hsl.h;
+        return [
             tinycolor(color),
             tinycolor({ h: (h + 90) % 360, s: hsl.s, l: hsl.l }),
             tinycolor({ h: (h + 180) % 360, s: hsl.s, l: hsl.l }),
             tinycolor({ h: (h + 270) % 360, s: hsl.s, l: hsl.l })
         ];
-        };
-        tinycolor.splitcomplement = function (color) {
-            var hsl = tinycolor(color).toHsl();
-            var h = hsl.h * 360;
-            return [
+    };
+    tinycolor.splitcomplement = function(color) {
+        var hsl = tinycolor(color).toHsl();
+        var h = hsl.h;
+        return [
             tinycolor(color),
-            tinycolor({ h: (h + 72) % 360, s: hsl.s, l: hsl.l }),
-            tinycolor({ h: (h + 216) % 360, s: hsl.s, l: hsl.l })
+            tinycolor({ h: (h + 72) % 360, s: hsl.s, l: hsl.l}),
+            tinycolor({ h: (h + 216) % 360, s: hsl.s, l: hsl.l})
         ];
-        };
-        tinycolor.analogous = function (color, results, slices) {
-            results = results || 6;
-            slices = slices || 30;
+    };
+    tinycolor.analogous = function(color, results, slices) {
+        results = results || 6;
+        slices = slices || 30;
+
+        var hsl = tinycolor(color).toHsl();
+        var part = 360 / slices;
+        var ret = [tinycolor(color)];
 
-            var hsl = tinycolor(color).toHsl();
-            var part = 360 / slices;
-            var ret = [tinycolor(color)];
+        for (hsl.h = ((hsl.h - (part * results >> 1)) + 720) % 360; --results; ) {
+            hsl.h = (hsl.h + part) % 360;
+            ret.push(tinycolor(hsl));
+        }
+        return ret;
+    };
+    tinycolor.monochromatic = function(color, results) {
+        results = results || 6;
+        var hsv = tinycolor(color).toHsv();
+        var h = hsv.h, s = hsv.s, v = hsv.v;
+        var ret = [];
+        var modification = 1 / results;
+
+        while (results--) {
+            ret.push(tinycolor({ h: h, s: s, v: v}));
+            v = (v + modification) % 1;
+        }
 
-            hsl.h *= 360;
+        return ret;
+    };
 
-            for (hsl.h = ((hsl.h - (part * results >> 1)) + 720) % 360; --results; ) {
-                hsl.h = (hsl.h + part) % 360;
-                ret.push(tinycolor(hsl));
-            }
-            return ret;
+
+    // Readability Functions
+    // ---------------------
+    // <http://www.w3.org/TR/AERT#color-contrast>
+
+    // `readability`
+    // Analyze the 2 colors and returns an object with the following properties:
+    //    `brightness`: difference in brightness between the two colors
+    //    `color`: difference in color/hue between the two colors
+    tinycolor.readability = function(color1, color2) {
+        var a = tinycolor(color1).toRgb();
+        var b = tinycolor(color2).toRgb();
+        var brightnessA = (a.r * 299 + a.g * 587 + a.b * 114) / 1000;
+        var brightnessB = (b.r * 299 + b.g * 587 + b.b * 114) / 1000;
+        var colorDiff = (
+            Math.max(a.r, b.r) - Math.min(a.r, b.r) +
+            Math.max(a.g, b.g) - Math.min(a.g, b.g) +
+            Math.max(a.b, b.b) - Math.min(a.b, b.b)
+        );
+
+        return {
+            brightness: Math.abs(brightnessA - brightnessB),
+            color: colorDiff
         };
-        tinycolor.monochromatic = function (color, results) {
-            results = results || 6;
-            var hsv = tinycolor(color).toHsv();
-            var h = hsv.h, s = hsv.s, v = hsv.v;
-            var ret = [];
-            var modification = 1 / results;
-
-            while (results--) {
-                ret.push(tinycolor({ h: h, s: s, v: v }));
-                v = (v + modification) % 1;
+    };
+
+    // `readable`
+    // http://www.w3.org/TR/AERT#color-contrast
+    // Ensure that foreground and background color combinations provide sufficient contrast.
+    // *Example*
+    //    tinycolor.readable("#000", "#111") => false
+    tinycolor.readable = function(color1, color2) {
+        var readability = tinycolor.readability(color1, color2);
+        return readability.brightness > 125 && readability.color > 500;
+    };
+
+    // `mostReadable`
+    // Given a base color and a list of possible foreground or background
+    // colors for that base, returns the most readable color.
+    // *Example*
+    //    tinycolor.mostReadable("#123", ["#fff", "#000"]) => "#000"
+    tinycolor.mostReadable = function(baseColor, colorList) {
+        var bestColor = null;
+        var bestScore = 0;
+        var bestIsReadable = false;
+        for (var i=0; i < colorList.length; i++) {
+
+            // We normalize both around the "acceptable" breaking point,
+            // but rank brightness constrast higher than hue.
+
+            var readability = tinycolor.readability(baseColor, colorList[i]);
+            var readable = readability.brightness > 125 && readability.color > 500;
+            var score = 3 * (readability.brightness / 125) + (readability.color / 500);
+
+            if ((readable && ! bestIsReadable) ||
+                (readable && bestIsReadable && score > bestScore) ||
+                ((! readable) && (! bestIsReadable) && score > bestScore)) {
+                bestIsReadable = readable;
+                bestScore = score;
+                bestColor = tinycolor(colorList[i]);
             }
+        }
+        return bestColor;
+    };
 
-            return ret;
-        };
-        tinycolor.readable = function (color1, color2) {
-            var a = tinycolor(color1).toRgb(), b = tinycolor(color2).toRgb();
-            return (
-            (b.r - a.r) * (b.r - a.r) +
-            (b.g - a.g) * (b.g - a.g) +
-            (b.b - a.b) * (b.b - a.b)
-        ) > 0x28A4;
-        };
 
-        // Big List of Colors
-        // ---------
-        // <http://www.w3.org/TR/css3-color/#svg-color>
-        var names = tinycolor.names = {
-            aliceblue: "f0f8ff",
-            antiquewhite: "faebd7",
-            aqua: "0ff",
-            aquamarine: "7fffd4",
-            azure: "f0ffff",
-            beige: "f5f5dc",
-            bisque: "ffe4c4",
-            black: "000",
-            blanchedalmond: "ffebcd",
-            blue: "00f",
-            blueviolet: "8a2be2",
-            brown: "a52a2a",
-            burlywood: "deb887",
-            burntsienna: "ea7e5d",
-            cadetblue: "5f9ea0",
-            chartreuse: "7fff00",
-            chocolate: "d2691e",
-            coral: "ff7f50",
-            cornflowerblue: "6495ed",
-            cornsilk: "fff8dc",
-            crimson: "dc143c",
-            cyan: "0ff",
-            darkblue: "00008b",
-            darkcyan: "008b8b",
-            darkgoldenrod: "b8860b",
-            darkgray: "a9a9a9",
-            darkgreen: "006400",
-            darkgrey: "a9a9a9",
-            darkkhaki: "bdb76b",
-            darkmagenta: "8b008b",
-            darkolivegreen: "556b2f",
-            darkorange: "ff8c00",
-            darkorchid: "9932cc",
-            darkred: "8b0000",
-            darksalmon: "e9967a",
-            darkseagreen: "8fbc8f",
-            darkslateblue: "483d8b",
-            darkslategray: "2f4f4f",
-            darkslategrey: "2f4f4f",
-            darkturquoise: "00ced1",
-            darkviolet: "9400d3",
-            deeppink: "ff1493",
-            deepskyblue: "00bfff",
-            dimgray: "696969",
-            dimgrey: "696969",
-            dodgerblue: "1e90ff",
-            firebrick: "b22222",
-            floralwhite: "fffaf0",
-            forestgreen: "228b22",
-            fuchsia: "f0f",
-            gainsboro: "dcdcdc",
-            ghostwhite: "f8f8ff",
-            gold: "ffd700",
-            goldenrod: "daa520",
-            gray: "808080",
-            green: "008000",
-            greenyellow: "adff2f",
-            grey: "808080",
-            honeydew: "f0fff0",
-            hotpink: "ff69b4",
-            indianred: "cd5c5c",
-            indigo: "4b0082",
-            ivory: "fffff0",
-            khaki: "f0e68c",
-            lavender: "e6e6fa",
-            lavenderblush: "fff0f5",
-            lawngreen: "7cfc00",
-            lemonchiffon: "fffacd",
-            lightblue: "add8e6",
-            lightcoral: "f08080",
-            lightcyan: "e0ffff",
-            lightgoldenrodyellow: "fafad2",
-            lightgray: "d3d3d3",
-            lightgreen: "90ee90",
-            lightgrey: "d3d3d3",
-            lightpink: "ffb6c1",
-            lightsalmon: "ffa07a",
-            lightseagreen: "20b2aa",
-            lightskyblue: "87cefa",
-            lightslategray: "789",
-            lightslategrey: "789",
-            lightsteelblue: "b0c4de",
-            lightyellow: "ffffe0",
-            lime: "0f0",
-            limegreen: "32cd32",
-            linen: "faf0e6",
-            magenta: "f0f",
-            maroon: "800000",
-            mediumaquamarine: "66cdaa",
-            mediumblue: "0000cd",
-            mediumorchid: "ba55d3",
-            mediumpurple: "9370db",
-            mediumseagreen: "3cb371",
-            mediumslateblue: "7b68ee",
-            mediumspringgreen: "00fa9a",
-            mediumturquoise: "48d1cc",
-            mediumvioletred: "c71585",
-            midnightblue: "191970",
-            mintcream: "f5fffa",
-            mistyrose: "ffe4e1",
-            moccasin: "ffe4b5",
-            navajowhite: "ffdead",
-            navy: "000080",
-            oldlace: "fdf5e6",
-            olive: "808000",
-            olivedrab: "6b8e23",
-            orange: "ffa500",
-            orangered: "ff4500",
-            orchid: "da70d6",
-            palegoldenrod: "eee8aa",
-            palegreen: "98fb98",
-            paleturquoise: "afeeee",
-            palevioletred: "db7093",
-            papayawhip: "ffefd5",
-            peachpuff: "ffdab9",
-            peru: "cd853f",
-            pink: "ffc0cb",
-            plum: "dda0dd",
-            powderblue: "b0e0e6",
-            purple: "800080",
-            red: "f00",
-            rosybrown: "bc8f8f",
-            royalblue: "4169e1",
-            saddlebrown: "8b4513",
-            salmon: "fa8072",
-            sandybrown: "f4a460",
-            seagreen: "2e8b57",
-            seashell: "fff5ee",
-            sienna: "a0522d",
-            silver: "c0c0c0",
-            skyblue: "87ceeb",
-            slateblue: "6a5acd",
-            slategray: "708090",
-            slategrey: "708090",
-            snow: "fffafa",
-            springgreen: "00ff7f",
-            steelblue: "4682b4",
-            tan: "d2b48c",
-            teal: "008080",
-            thistle: "d8bfd8",
-            tomato: "ff6347",
-            turquoise: "40e0d0",
-            violet: "ee82ee",
-            wheat: "f5deb3",
-            white: "fff",
-            whitesmoke: "f5f5f5",
-            yellow: "ff0",
-            yellowgreen: "9acd32"
-        };
+    // Big List of Colors
+    // ------------------
+    // <http://www.w3.org/TR/css3-color/#svg-color>
+    var names = tinycolor.names = {
+        aliceblue: "f0f8ff",
+        antiquewhite: "faebd7",
+        aqua: "0ff",
+        aquamarine: "7fffd4",
+        azure: "f0ffff",
+        beige: "f5f5dc",
+        bisque: "ffe4c4",
+        black: "000",
+        blanchedalmond: "ffebcd",
+        blue: "00f",
+        blueviolet: "8a2be2",
+        brown: "a52a2a",
+        burlywood: "deb887",
+        burntsienna: "ea7e5d",
+        cadetblue: "5f9ea0",
+        chartreuse: "7fff00",
+        chocolate: "d2691e",
+        coral: "ff7f50",
+        cornflowerblue: "6495ed",
+        cornsilk: "fff8dc",
+        crimson: "dc143c",
+        cyan: "0ff",
+        darkblue: "00008b",
+        darkcyan: "008b8b",
+        darkgoldenrod: "b8860b",
+        darkgray: "a9a9a9",
+        darkgreen: "006400",
+        darkgrey: "a9a9a9",
+        darkkhaki: "bdb76b",
+        darkmagenta: "8b008b",
+        darkolivegreen: "556b2f",
+        darkorange: "ff8c00",
+        darkorchid: "9932cc",
+        darkred: "8b0000",
+        darksalmon: "e9967a",
+        darkseagreen: "8fbc8f",
+        darkslateblue: "483d8b",
+        darkslategray: "2f4f4f",
+        darkslategrey: "2f4f4f",
+        darkturquoise: "00ced1",
+        darkviolet: "9400d3",
+        deeppink: "ff1493",
+        deepskyblue: "00bfff",
+        dimgray: "696969",
+        dimgrey: "696969",
+        dodgerblue: "1e90ff",
+        firebrick: "b22222",
+        floralwhite: "fffaf0",
+        forestgreen: "228b22",
+        fuchsia: "f0f",
+        gainsboro: "dcdcdc",
+        ghostwhite: "f8f8ff",
+        gold: "ffd700",
+        goldenrod: "daa520",
+        gray: "808080",
+        green: "008000",
+        greenyellow: "adff2f",
+        grey: "808080",
+        honeydew: "f0fff0",
+        hotpink: "ff69b4",
+        indianred: "cd5c5c",
+        indigo: "4b0082",
+        ivory: "fffff0",
+        khaki: "f0e68c",
+        lavender: "e6e6fa",
+        lavenderblush: "fff0f5",
+        lawngreen: "7cfc00",
+        lemonchiffon: "fffacd",
+        lightblue: "add8e6",
+        lightcoral: "f08080",
+        lightcyan: "e0ffff",
+        lightgoldenrodyellow: "fafad2",
+        lightgray: "d3d3d3",
+        lightgreen: "90ee90",
+        lightgrey: "d3d3d3",
+        lightpink: "ffb6c1",
+        lightsalmon: "ffa07a",
+        lightseagreen: "20b2aa",
+        lightskyblue: "87cefa",
+        lightslategray: "789",
+        lightslategrey: "789",
+        lightsteelblue: "b0c4de",
+        lightyellow: "ffffe0",
+        lime: "0f0",
+        limegreen: "32cd32",
+        linen: "faf0e6",
+        magenta: "f0f",
+        maroon: "800000",
+        mediumaquamarine: "66cdaa",
+        mediumblue: "0000cd",
+        mediumorchid: "ba55d3",
+        mediumpurple: "9370db",
+        mediumseagreen: "3cb371",
+        mediumslateblue: "7b68ee",
+        mediumspringgreen: "00fa9a",
+        mediumturquoise: "48d1cc",
+        mediumvioletred: "c71585",
+        midnightblue: "191970",
+        mintcream: "f5fffa",
+        mistyrose: "ffe4e1",
+        moccasin: "ffe4b5",
+        navajowhite: "ffdead",
+        navy: "000080",
+        oldlace: "fdf5e6",
+        olive: "808000",
+        olivedrab: "6b8e23",
+        orange: "ffa500",
+        orangered: "ff4500",
+        orchid: "da70d6",
+        palegoldenrod: "eee8aa",
+        palegreen: "98fb98",
+        paleturquoise: "afeeee",
+        palevioletred: "db7093",
+        papayawhip: "ffefd5",
+        peachpuff: "ffdab9",
+        peru: "cd853f",
+        pink: "ffc0cb",
+        plum: "dda0dd",
+        powderblue: "b0e0e6",
+        purple: "800080",
+        red: "f00",
+        rosybrown: "bc8f8f",
+        royalblue: "4169e1",
+        saddlebrown: "8b4513",
+        salmon: "fa8072",
+        sandybrown: "f4a460",
+        seagreen: "2e8b57",
+        seashell: "fff5ee",
+        sienna: "a0522d",
+        silver: "c0c0c0",
+        skyblue: "87ceeb",
+        slateblue: "6a5acd",
+        slategray: "708090",
+        slategrey: "708090",
+        snow: "fffafa",
+        springgreen: "00ff7f",
+        steelblue: "4682b4",
+        tan: "d2b48c",
+        teal: "008080",
+        thistle: "d8bfd8",
+        tomato: "ff6347",
+        turquoise: "40e0d0",
+        violet: "ee82ee",
+        wheat: "f5deb3",
+        white: "fff",
+        whitesmoke: "f5f5f5",
+        yellow: "ff0",
+        yellowgreen: "9acd32"
+    };
 
-        // Make it easy to access colors via `hexNames[hex]`
-        var hexNames = tinycolor.hexNames = flip(names);
+    // Make it easy to access colors via `hexNames[hex]`
+    var hexNames = tinycolor.hexNames = flip(names);
 
 
-        // Utilities
-        // ---------
+    // Utilities
+    // ---------
 
-        // `{ 'name1': 'val1' }` becomes `{ 'val1': 'name1' }`
-        function flip(o) {
-            var flipped = {};
-            for (var i in o) {
-                if (o.hasOwnProperty(i)) {
-                    flipped[o[i]] = i;
-                }
+    // `{ 'name1': 'val1' }` becomes `{ 'val1': 'name1' }`
+    function flip(o) {
+        var flipped = { };
+        for (var i in o) {
+            if (o.hasOwnProperty(i)) {
+                flipped[o[i]] = i;
             }
-            return flipped;
         }
+        return flipped;
+    }
 
-        // Take input from [0, n] and return it as [0, 1]
-        function bound01(n, max) {
-            if (isOnePointZero(n)) { n = "100%"; }
+    // Return a valid alpha value [0,1] with all invalid values being set to 1
+    function boundAlpha(a) {
+        a = parseFloat(a);
 
-            var processPercent = isPercentage(n);
-            n = mathMin(max, mathMax(0, parseFloat(n)));
+        if (isNaN(a) || a < 0 || a > 1) {
+            a = 1;
+        }
 
-            // Automatically convert percentage into number
-            if (processPercent) {
-                n = n * (max / 100);
-            }
+        return a;
+    }
 
-            // Handle floating point rounding errors
-            if (math.abs(n - max) < 0.000001) {
-                return 1;
-            }
-            else if (n >= 1) {
-                return (n % max) / parseFloat(max);
-            }
-            return n;
-        }
+    // Take input from [0, n] and return it as [0, 1]
+    function bound01(n, max) {
+        if (isOnePointZero(n)) { n = "100%"; }
 
-        // Force a number between 0 and 1
-        function clamp01(val) {
-            return mathMin(1, mathMax(0, val));
-        }
+        var processPercent = isPercentage(n);
+        n = mathMin(max, mathMax(0, parseFloat(n)));
 
-        // Parse an integer into hex
-        function parseHex(val) {
-            return parseInt(val, 16);
+        // Automatically convert percentage into number
+        if (processPercent) {
+            n = parseInt(n * max, 10) / 100;
         }
 
-        // Need to handle 1.0 as 100%, since once it is a number, there is no difference between it and 1
-        // <http://stackoverflow.com/questions/7422072/javascript-how-to-detect-number-as-a-decimal-including-1-0>
-        function isOnePointZero(n) {
-            return typeof n == "string" && n.indexOf('.') != -1 && parseFloat(n) === 1;
+        // Handle floating point rounding errors
+        if ((math.abs(n - max) < 0.000001)) {
+            return 1;
         }
 
-        // Check to see if string passed in is a percentage
-        function isPercentage(n) {
-            return typeof n === "string" && n.indexOf('%') != -1;
-        }
+        // Convert into [0, 1] range if it isn't already
+        return (n % max) / parseFloat(max);
+    }
+
+    // Force a number between 0 and 1
+    function clamp01(val) {
+        return mathMin(1, mathMax(0, val));
+    }
+
+    // Parse an integer into hex
+    function parseHex(val) {
+        return parseInt(val, 16);
+    }
+
+    // Need to handle 1.0 as 100%, since once it is a number, there is no difference between it and 1
+    // <http://stackoverflow.com/questions/7422072/javascript-how-to-detect-number-as-a-decimal-including-1-0>
+    function isOnePointZero(n) {
+        return typeof n == "string" && n.indexOf('.') != -1 && parseFloat(n) === 1;
+    }
+
+    // Check to see if string passed in is a percentage
+    function isPercentage(n) {
+        return typeof n === "string" && n.indexOf('%') != -1;
+    }
 
-        // Force a hex value to have 2 characters
-        function pad2(c) {
-            return c.length == 1 ? '0' + c : '' + c;
+    // Force a hex value to have 2 characters
+    function pad2(c) {
+        return c.length == 1 ? '0' + c : '' + c;
+    }
+
+    // Replace a decimal with it's percentage value
+    function convertToPercentage(n) {
+        if (n <= 1) {
+            n = (n * 100) + "%";
         }
 
-        var matchers = (function () {
+        return n;
+    }
+
+    var matchers = (function() {
+
+        // <http://www.w3.org/TR/css3-values/#integers>
+        var CSS_INTEGER = "[-\\+]?\\d+%?";
 
-            // <http://www.w3.org/TR/css3-values/#integers>
-            var CSS_INTEGER = "[-\\+]?\\d+%?";
+        // <http://www.w3.org/TR/css3-values/#number-value>
+        var CSS_NUMBER = "[-\\+]?\\d*\\.\\d+%?";
 
-            // <http://www.w3.org/TR/css3-values/#number-value>
-            var CSS_NUMBER = "[-\\+]?\\d*\\.\\d+%?";
+        // Allow positive/negative integer/number.  Don't capture the either/or, just the entire outcome.
+        var CSS_UNIT = "(?:" + CSS_NUMBER + ")|(?:" + CSS_INTEGER + ")";
+
+        // Actual matching.
+        // Parentheses and commas are optional, but not required.
+        // Whitespace can take the place of commas or opening paren
+        var PERMISSIVE_MATCH3 = "[\\s|\\(]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")\\s*\\)?";
+        var PERMISSIVE_MATCH4 = "[\\s|\\(]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")\\s*\\)?";
+
+        return {
+            rgb: new RegExp("rgb" + PERMISSIVE_MATCH3),
+            rgba: new RegExp("rgba" + PERMISSIVE_MATCH4),
+            hsl: new RegExp("hsl" + PERMISSIVE_MATCH3),
+            hsla: new RegExp("hsla" + PERMISSIVE_MATCH4),
+            hsv: new RegExp("hsv" + PERMISSIVE_MATCH3),
+            hex3: /^([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})$/,
+            hex6: /^([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/
+        };
+    })();
 
-            // Allow positive/negative integer/number.  Don't capture the either/or, just the entire outcome.
-            var CSS_UNIT = "(?:" + CSS_NUMBER + ")|(?:" + CSS_INTEGER + ")";
+    // `stringInputToObject`
+    // Permissive string parsing.  Take in a number of formats, and output an object
+    // based on detected format.  Returns `{ r, g, b }` or `{ h, s, l }` or `{ h, s, v}`
+    function stringInputToObject(color) {
 
-            // Actual matching.
-            // Parentheses and commas are optional, but not required.
-            // Whitespace can take the place of commas or opening paren
-            var PERMISSIVE_MATCH3 = "[\\s|\\(]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")\\s*\\)?";
-            var PERMISSIVE_MATCH4 = "[\\s|\\(]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")\\s*\\)?";
+        color = color.replace(trimLeft,'').replace(trimRight, '').toLowerCase();
+        var named = false;
+        if (names[color]) {
+            color = names[color];
+            named = true;
+        }
+        else if (color == 'transparent') {
+            return { r: 0, g: 0, b: 0, a: 0, format: "name" };
+        }
 
+        // Try to match string input using regular expressions.
+        // Keep most of the number bounding out of this function - don't worry about [0,1] or [0,100] or [0,360]
+        // Just return an object and let the conversion functions handle that.
+        // This way the result will be the same whether the tinycolor is initialized with string or object.
+        var match;
+        if ((match = matchers.rgb.exec(color))) {
+            return { r: match[1], g: match[2], b: match[3] };
+        }
+        if ((match = matchers.rgba.exec(color))) {
+            return { r: match[1], g: match[2], b: match[3], a: match[4] };
+        }
+        if ((match = matchers.hsl.exec(color))) {
+            return { h: match[1], s: match[2], l: match[3] };
+        }
+        if ((match = matchers.hsla.exec(color))) {
+            return { h: match[1], s: match[2], l: match[3], a: match[4] };
+        }
+        if ((match = matchers.hsv.exec(color))) {
+            return { h: match[1], s: match[2], v: match[3] };
+        }
+        if ((match = matchers.hex6.exec(color))) {
             return {
-                rgb: new RegExp("rgb" + PERMISSIVE_MATCH3),
-                rgba: new RegExp("rgba" + PERMISSIVE_MATCH4),
-                hsl: new RegExp("hsl" + PERMISSIVE_MATCH3),
-                hsla: new RegExp("hsla" + PERMISSIVE_MATCH4),
-                hsv: new RegExp("hsv" + PERMISSIVE_MATCH3),
-                hex3: /^([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})$/,
-                hex6: /^([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/
+                r: parseHex(match[1]),
+                g: parseHex(match[2]),
+                b: parseHex(match[3]),
+                format: named ? "name" : "hex"
             };
-        })();
-
-        // `stringInputToObject`
-        // Permissive string parsing.  Take in a number of formats, and output an object
-        // based on detected format.  Returns `{ r, g, b }` or `{ h, s, l }` or `{ h, s, v}`
-        function stringInputToObject(color) {
-
-            color = color.replace(trimLeft, '').replace(trimRight, '').toLowerCase();
-            var named = false;
-            if (names[color]) {
-                color = names[color];
-                named = true;
-            }
-            else if (color == 'transparent') {
-                return { r: 0, g: 0, b: 0, a: 0 };
-            }
+        }
+        if ((match = matchers.hex3.exec(color))) {
+            return {
+                r: parseHex(match[1] + '' + match[1]),
+                g: parseHex(match[2] + '' + match[2]),
+                b: parseHex(match[3] + '' + match[3]),
+                format: named ? "name" : "hex"
+            };
+        }
 
-            // Try to match string input using regular expressions.
-            // Keep most of the number bounding out of this function - don't worry about [0,1] or [0,100] or [0,360]
-            // Just return an object and let the conversion functions handle that.
-            // This way the result will be the same whether the tinycolor is initialized with string or object.
-            var match;
-            if ((match = matchers.rgb.exec(color))) {
-                return { r: match[1], g: match[2], b: match[3] };
-            }
-            if ((match = matchers.rgba.exec(color))) {
-                return { r: match[1], g: match[2], b: match[3], a: match[4] };
-            }
-            if ((match = matchers.hsl.exec(color))) {
-                return { h: match[1], s: match[2], l: match[3] };
-            }
-            if ((match = matchers.hsla.exec(color))) {
-                return { h: match[1], s: match[2], l: match[3], a: match[4] };
-            }
-            if ((match = matchers.hsv.exec(color))) {
-                return { h: match[1], s: match[2], v: match[3] };
-            }
-            if ((match = matchers.hex6.exec(color))) {
-                return {
-                    r: parseHex(match[1]),
-                    g: parseHex(match[2]),
-                    b: parseHex(match[3]),
-                    format: named ? "name" : "hex"
-                };
-            }
-            if ((match = matchers.hex3.exec(color))) {
-                return {
-                    r: parseHex(match[1] + '' + match[1]),
-                    g: parseHex(match[2] + '' + match[2]),
-                    b: parseHex(match[3] + '' + match[3]),
-                    format: named ? "name" : "hex"
-                };
-            }
+        return false;
+    }
 
-            return false;
-        }
+    // Expose tinycolor to window, does not need to run in non-browser context.
+    window.tinycolor = tinycolor;
 
-        // Everything is ready, expose to window
-        window.tinycolor = tinycolor;
+    })();
 
-    })(this);
 
     $(function () {
         if ($.fn.spectrum.load) {
@@ -1760,9 +2029,4 @@ define(['jquery'], function (jQuery) {
         }
     });
 
-
-    function log(){window.console&&(log=Function.prototype.bind?Function.prototype.bind.call(console.log,console):function(){Function.prototype.apply.call(console.log,console,arguments)},log.apply(this,arguments))};
-
-
 })(window, jQuery);
-});
diff --git a/tests/index.html b/tests/index.html
index 802aef8ef93..3513f99d4d2 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -15,9 +15,10 @@
 
     </head>
     <body>
-        <div class="row-fluid">
-            <div class="span12">
+        <div class="row">
+            <div class="col-md-12">
                 <h1>Unit tests</h1>
+
                 <h2>Core</h2>
                 <ul>
                     <li><a href="/tests/qunit/tests/cleanjs.html">Clean JavaScript</a></li>
diff --git a/tests/qunit/tests/cleanjs.html b/tests/qunit/tests/cleanjs.html
index db32048ba3b..4e30f8fb817 100644
--- a/tests/qunit/tests/cleanjs.html
+++ b/tests/qunit/tests/cleanjs.html
@@ -7,12 +7,16 @@
         <script src="/shared/vendor/js/qunit.js"></script>
     </head>
     <body>
-        <h1 id="qunit-header">Open Academic Environment - Core - Clean JavaScript</h1>
-        <h2 id="qunit-banner"></h2>
-        <div id="qunit-testrunner-toolbar"></div>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture"></div>
+        <div>
+            <div>
+                <h1 id="qunit-header">Open Academic Environment - Core - Clean JavaScript</h1>
+                <h2 id="qunit-banner"></h2>
+                <div id="qunit-testrunner-toolbar"></div>
+                <h2 id="qunit-userAgent"></h2>
+                <ol id="qunit-tests"></ol>
+                <div id="qunit-fixture"></div>
+            </div>
+        </div>
 
         <script>QUnit.config.autostart = false;</script>
         <script data-main="/shared/oae/api/oae.bootstrap.js" data-loadmodule="/tests/qunit/tests/js/cleanjs.js" src="/shared/vendor/js/requirejs/require-jquery.js"></script>
diff --git a/tests/qunit/tests/cssformatting.html b/tests/qunit/tests/cssformatting.html
index c998d711ed2..760136170e7 100644
--- a/tests/qunit/tests/cssformatting.html
+++ b/tests/qunit/tests/cssformatting.html
@@ -8,12 +8,16 @@
         <script src="/shared/vendor/js/qunit.js"></script>
     </head>
     <body>
-        <h1 id="qunit-header">Open Academic Environment - Formatting - CSS formatting</h1>
-        <h2 id="qunit-banner"></h2>
-        <div id="qunit-testrunner-toolbar"></div>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture"></div>
+        <div>
+            <div>
+                <h1 id="qunit-header">Open Academic Environment - Formatting - CSS formatting</h1>
+                <h2 id="qunit-banner"></h2>
+                <div id="qunit-testrunner-toolbar"></div>
+                <h2 id="qunit-userAgent"></h2>
+                <ol id="qunit-tests"></ol>
+                <div id="qunit-fixture"></div>
+            </div>
+        </div>
 
         <script>QUnit.config.autostart = false;</script>
         <script data-main="/shared/oae/api/oae.bootstrap.js" data-loadmodule="/tests/qunit/tests/js/cssformatting.js" src="/shared/vendor/js/requirejs/require-jquery.js"></script>
diff --git a/tests/qunit/tests/doubletranslated.html b/tests/qunit/tests/doubletranslated.html
index 0820f652026..de400b95c89 100644
--- a/tests/qunit/tests/doubletranslated.html
+++ b/tests/qunit/tests/doubletranslated.html
@@ -8,12 +8,16 @@
         <script src="/shared/vendor/js/qunit.js"></script>
     </head>
     <body>
-        <h1 id="qunit-header">Open Academic Environment - i18n - Double Translation Keys</h1>
-        <h2 id="qunit-banner"></h2>
-        <div id="qunit-testrunner-toolbar"></div>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture"></div>
+        <div>
+            <div>
+                <h1 id="qunit-header">Open Academic Environment - i18n - Double Translation Keys</h1>
+                <h2 id="qunit-banner"></h2>
+                <div id="qunit-testrunner-toolbar"></div>
+                <h2 id="qunit-userAgent"></h2>
+                <ol id="qunit-tests"></ol>
+                <div id="qunit-fixture"></div>
+            </div>
+        </div>
 
         <script>QUnit.config.autostart = false;</script>
         <script data-main="/shared/oae/api/oae.bootstrap.js" data-loadmodule="/tests/qunit/tests/js/doubletranslated.js" src="/shared/vendor/js/requirejs/require-jquery.js"></script>
diff --git a/tests/qunit/tests/jsformatting.html b/tests/qunit/tests/jsformatting.html
index 43e5231deff..ef00f83f3a1 100644
--- a/tests/qunit/tests/jsformatting.html
+++ b/tests/qunit/tests/jsformatting.html
@@ -8,12 +8,16 @@
         <script src="/shared/vendor/js/qunit.js"></script>
     </head>
     <body>
-        <h1 id="qunit-header">Open Academic Environment - Formatting - JavaScript Formatting</h1>
-        <h2 id="qunit-banner"></h2>
-        <div id="qunit-testrunner-toolbar"></div>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture"></div>
+        <div>
+            <div>
+                <h1 id="qunit-header">Open Academic Environment - Formatting - JavaScript Formatting</h1>
+                <h2 id="qunit-banner"></h2>
+                <div id="qunit-testrunner-toolbar"></div>
+                <h2 id="qunit-userAgent"></h2>
+                <ol id="qunit-tests"></ol>
+                <div id="qunit-fixture"></div>
+            </div>
+        </div>
 
         <script>QUnit.config.autostart = false;</script>
         <script data-main="/shared/oae/api/oae.bootstrap.js" data-loadmodule="/tests/qunit/tests/js/jsformatting.js" src="/shared/vendor/js/requirejs/require-jquery.js"></script>
diff --git a/tests/qunit/tests/uninternationalizedstrings.html b/tests/qunit/tests/uninternationalizedstrings.html
index a148b408993..6b2d7a2a102 100644
--- a/tests/qunit/tests/uninternationalizedstrings.html
+++ b/tests/qunit/tests/uninternationalizedstrings.html
@@ -8,12 +8,16 @@
         <script src="/shared/vendor/js/qunit.js"></script>
     </head>
     <body>
-        <h1 id="qunit-header">Open Academic Environment - i18n - Uninternationalized Strings</h1>
-        <h2 id="qunit-banner"></h2>
-        <div id="qunit-testrunner-toolbar"></div>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture"></div>
+        <div>
+            <div>
+                <h1 id="qunit-header">Open Academic Environment - i18n - Uninternationalized Strings</h1>
+                <h2 id="qunit-banner"></h2>
+                <div id="qunit-testrunner-toolbar"></div>
+                <h2 id="qunit-userAgent"></h2>
+                <ol id="qunit-tests"></ol>
+                <div id="qunit-fixture"></div>
+            </div>
+        </div>
 
         <script>QUnit.config.autostart = false;</script>
         <script data-main="/shared/oae/api/oae.bootstrap.js" data-loadmodule="/tests/qunit/tests/js/uninternationalizedstrings.js" src="/shared/vendor/js/requirejs/require-jquery.js"></script>
diff --git a/tests/qunit/tests/untranslatedkeys.html b/tests/qunit/tests/untranslatedkeys.html
index a669c113254..a09c9a07a9f 100644
--- a/tests/qunit/tests/untranslatedkeys.html
+++ b/tests/qunit/tests/untranslatedkeys.html
@@ -8,12 +8,16 @@
         <script src="/shared/vendor/js/qunit.js"></script>
     </head>
     <body>
-        <h1 id="qunit-header">Open Academic Environment - i18n - Untranslated Keys</h1>
-        <h2 id="qunit-banner"></h2>
-        <div id="qunit-testrunner-toolbar"></div>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture"></div>
+        <div>
+            <div>
+                <h1 id="qunit-header">Open Academic Environment - i18n - Untranslated Keys</h1>
+                <h2 id="qunit-banner"></h2>
+                <div id="qunit-testrunner-toolbar"></div>
+                <h2 id="qunit-userAgent"></h2>
+                <ol id="qunit-tests"></ol>
+                <div id="qunit-fixture"></div>
+            </div>
+        </div>
 
         <script>QUnit.config.autostart = false;</script>
         <script data-main="/shared/oae/api/oae.bootstrap.js" data-loadmodule="/tests/qunit/tests/js/untranslatedkeys.js" src="/shared/vendor/js/requirejs/require-jquery.js"></script>
diff --git a/tests/qunit/tests/unusedkeys.html b/tests/qunit/tests/unusedkeys.html
index 5ea4db03aef..4c98a42835a 100644
--- a/tests/qunit/tests/unusedkeys.html
+++ b/tests/qunit/tests/unusedkeys.html
@@ -8,12 +8,16 @@
         <script src="/shared/vendor/js/qunit.js"></script>
     </head>
     <body>
-        <h1 id="qunit-header">Open Academic Environment - i18n - Unused Translation Keys</h1>
-        <h2 id="qunit-banner"></h2>
-        <div id="qunit-testrunner-toolbar"></div>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture"></div>
+        <div>
+            <div>
+                <h1 id="qunit-header">Open Academic Environment - i18n - Unused Translation Keys</h1>
+                <h2 id="qunit-banner"></h2>
+                <div id="qunit-testrunner-toolbar"></div>
+                <h2 id="qunit-userAgent"></h2>
+                <ol id="qunit-tests"></ol>
+                <div id="qunit-fixture"></div>
+            </div>
+        </div>
 
         <script>QUnit.config.autostart = false;</script>
         <script data-main="/shared/oae/api/oae.bootstrap.js" data-loadmodule="/tests/qunit/tests/js/unusedkeys.js" src="/shared/vendor/js/requirejs/require-jquery.js"></script>
diff --git a/tests/qunit/tests/wcag.html b/tests/qunit/tests/wcag.html
index cce18add949..f18e0e91cf6 100644
--- a/tests/qunit/tests/wcag.html
+++ b/tests/qunit/tests/wcag.html
@@ -8,12 +8,16 @@
         <script src="/shared/vendor/js/qunit.js"></script>
     </head>
     <body>
-        <h1 id="qunit-header">Open Academic Environment - Accessibility - WCAG 2.0 Compliance</h1>
-        <h2 id="qunit-banner"></h2>
-        <div id="qunit-testrunner-toolbar"></div>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture"></div>
+        <div>
+            <div>
+                <h1 id="qunit-header">Open Academic Environment - Accessibility - WCAG 2.0 Compliance</h1>
+                <h2 id="qunit-banner"></h2>
+                <div id="qunit-testrunner-toolbar"></div>
+                <h2 id="qunit-userAgent"></h2>
+                <ol id="qunit-tests"></ol>
+                <div id="qunit-fixture"></div>
+            </div>
+        </div>
 
         <script>QUnit.config.autostart = false;</script>
         <script data-main="/shared/oae/api/oae.bootstrap.js" data-loadmodule="/tests/qunit/tests/js/wcag.js" src="/shared/vendor/js/requirejs/require-jquery.js"></script>
diff --git a/ui/bundles/ca_ES.properties b/ui/bundles/ca_ES.properties
index 866bfde9bef..534895bb5ea 100644
--- a/ui/bundles/ca_ES.properties
+++ b/ui/bundles/ca_ES.properties
@@ -281,7 +281,6 @@ OAE=Ambiente academic obert
 OR=o
 OTHER_DOCUMENT=Altre document
 PAGE_NOT_FOUND=Patgina no trobada
-PARTICIPANTS_ONLY=Soles participants
 PARTICIPATING_IN_DISCUSSIONS_AND_FEEDBACK_WITHIN_PERSONALIZED_NETWORKS=Participar en els f\u00f2rums i comentaris en les xarxes personalitzades dels recursos i les persones, promou l'aprenentatge com els equips de projectes col\u00b7laborar i comunicar-se.
 PASSWORD=Contrasenya
 PASSWORD_COLON=contrasenya\:
diff --git a/ui/bundles/de_DE.properties b/ui/bundles/de_DE.properties
index 78dabd1f290..683f3487733 100644
--- a/ui/bundles/de_DE.properties
+++ b/ui/bundles/de_DE.properties
@@ -301,7 +301,6 @@ OAE=Open Academic Environment
 OR=oder
 OTHER_DOCUMENT=Sonstige Dokumente
 PAGE_NOT_FOUND=Seite nicht gefunden
-PARTICIPANTS_ONLY=Nur f\u00fcr Teilnehmende
 PARTICIPATING_IN_DISCUSSIONS_AND_FEEDBACK_WITHIN_PERSONALIZED_NETWORKS=Die M\u00f6glichkeit der Teilnahme an Diskussionen und Feedback im Rahmen individueller Netzwerke von Personen und Ressourcen f\u00f6rdert die akademische Zusammenarbeit.
 PASSWORD=Passwort
 PASSWORD_COLON=Passwort\:
diff --git a/ui/bundles/default.properties b/ui/bundles/default.properties
index 9fc11894ed2..06b8aa6de14 100644
--- a/ui/bundles/default.properties
+++ b/ui/bundles/default.properties
@@ -282,6 +282,7 @@ MANAGER = Manager
 MARKDOWN = Markdown
 MEMBER = Member
 MEMBERS = Members
+MEMBERS_ONLY = Members only
 MY_ACCOUNT = My account
 MY_DISCUSSIONS = My discussions
 MY_GROUPS = My groups
@@ -302,7 +303,6 @@ OAE = Open Academic Environment
 OR = or
 OTHER_DOCUMENT = Other document
 PAGE_NOT_FOUND = Page not found
-PARTICIPANTS_ONLY = Participants only
 PARTICIPATING_IN_DISCUSSIONS_AND_FEEDBACK_WITHIN_PERSONALIZED_NETWORKS = Participating in discussions and feedback within personalized networks of resources and people, furthers learning as project teams collaborate and communicate.
 PASSWORD = Password
 PASSWORD_COLON = Password:
@@ -372,6 +372,7 @@ THIS_FIELD_IS_REQUIRED = This field is required
 THIS_PASSWORD_DOES_NOT_MATCH_THE_FIRST_ONE = This password does not match the first one
 TITLE = Title
 TITLE_PREFIX = Open Academic Environment
+TOGGLE_NAVIGATION = Toggle navigation
 UNFOLLOW = Unfollow
 UPDATE = Update
 UPLOAD = Upload
diff --git a/ui/bundles/es_ES.properties b/ui/bundles/es_ES.properties
index f73ab795253..565eb54a435 100644
--- a/ui/bundles/es_ES.properties
+++ b/ui/bundles/es_ES.properties
@@ -301,7 +301,6 @@ OAE=Ambiente acad\u00e9mico abierto
 OR=o
 OTHER_DOCUMENT=Otro documento
 PAGE_NOT_FOUND=P\u00e1gina no encontrada
-PARTICIPANTS_ONLY=S\u00f3lo participantes
 PARTICIPATING_IN_DISCUSSIONS_AND_FEEDBACK_WITHIN_PERSONALIZED_NETWORKS=Participar en los foros y comentarios en las redes personalizadas de los recursos y las personas, promueve el aprendizaje como los equipos de proyectos colaborar y comunicarse.
 PASSWORD=Contrase\u00f1a
 PASSWORD_COLON=contrase\u00f1a\:
diff --git a/ui/bundles/fr_FR.properties b/ui/bundles/fr_FR.properties
index 7023df6a454..dd56bd76fa4 100644
--- a/ui/bundles/fr_FR.properties
+++ b/ui/bundles/fr_FR.properties
@@ -301,7 +301,6 @@ OAE=Open Academic Environment
 OR=ou
 OTHER_DOCUMENT=Autre document
 PAGE_NOT_FOUND=Page non trouv\u00e9e
-PARTICIPANTS_ONLY=Participants uniquement
 PARTICIPATING_IN_DISCUSSIONS_AND_FEEDBACK_WITHIN_PERSONALIZED_NETWORKS=Participer \u00e0 des discussions, des commentaires au sein des r\u00e9seaux personnalis\u00e9s de ressources et de personnes, favorisent l'apprentissage, le travail en \u00e9quipe, la  collaboration et la communication.
 PASSWORD=Mot de passe
 PASSWORD_COLON=Mot de passe \:
diff --git a/ui/bundles/hi_IN.properties b/ui/bundles/hi_IN.properties
index f186622eae2..8686739d03d 100644
--- a/ui/bundles/hi_IN.properties
+++ b/ui/bundles/hi_IN.properties
@@ -31,27 +31,27 @@ ACTIVITY_CONTENT_REVISION_COLLABDOC_1=<a href\="${actor1URL}">${actor1}</a> \u09
 ACTIVITY_CONTENT_REVISION_COLLABDOC_2=<a href\="${actor1URL}"> ${actor1}</a> \u0914\u0930 <a href\="${actor2URL}">${actor2}</a> \u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u093c &quot;<a href\="${object1URL}">${object1}</a>&quot;  \u0938\u0902\u092a\u093e\u0926\u093f\u0924 \u0915\u0940
 ACTIVITY_CONTENT_REVISION_COLLABDOC_2+=<a href\="${actor1URL}"> ${actor1}</a> \u0914\u0930 ${actorCount - 1} \u0905\u0928\u094d\u092f \u0932\u094b\u0917\u094b\u0902  &quot;<a href\="${object1URL}"> ${object1}</a> &quot;  \u0938\u0902\u092a\u093e\u0926\u093f\u0924 \u0915\u0940
 ACTIVITY_CONTENT_REVISION_FILE_1=<a href\="${actor1URL}"> ${actor1}</a> \u0928\u0947 &quot;<a href\="${object1URL}"> ${object1}</a>&quot; \u0915\u093e \u090f\u0915 \u0928\u092f\u093e \u0938\u0902\u0938\u094d\u0915\u0930\u0923 \u0905\u092a\u0932\u094b\u0921 \u0915\u093f\u092f\u093e
-ACTIVITY_CONTENT_REVISION_FILE_2=<a href\="${actor1URL}">${actor1}</a> \u0914\u0930 <a href\="${actor2URL}">${actor2}</a> \u0928\u0947 &quot;"<a href\="${object1URL}">${object1}</a>&quot; \u0915\u093e \u0928\u092f\u093e \u0938\u0902\u0938\u094d\u0915\u0930\u0923 \u0905\u092a\u0932\u094b\u0921 \u0915\u093f\u092f\u093e \u0939\u0948  
-ACTIVITY_CONTENT_REVISION_FILE_2+=<a href\="${actor1URL}"> ${actor1}</a> \u0914\u0930 ${actorCount - 1}  \u0926\u0942\u0938\u0930\u0947 \u0932\u094b\u0917\u094b\u0902  &quot;<a href\="${object1URL}">${object1}</a>&quot; \u0915\u093e \u0928\u092f\u093e \u0938\u0902\u0938\u094d\u0915\u0930\u0923 \u0905\u092a\u0932\u094b\u0921 \u0915\u093f\u092f\u093e \u0939\u0948   
-ACTIVITY_CONTENT_REVISION_LINK_1=<a href\="${actor1URL}"> ${actor1}</a> \u0928\u0947 &quot;<a href\="${object1URL}">${object1}</a>&quot; \u0932\u093f\u0902\u0915 \u0938\u092e\u094d\u092a\u093e\u0926\u093f\u0924 \u0915\u093f\u092f\u093e    
+ACTIVITY_CONTENT_REVISION_FILE_2=<a href\="${actor1URL}">${actor1}</a> \u0914\u0930 <a href\="${actor2URL}">${actor2}</a> \u0928\u0947 &quot;"<a href\="${object1URL}">${object1}</a>&quot; \u0915\u093e \u0928\u092f\u093e \u0938\u0902\u0938\u094d\u0915\u0930\u0923 \u0905\u092a\u0932\u094b\u0921 \u0915\u093f\u092f\u093e \u0939\u0948
+ACTIVITY_CONTENT_REVISION_FILE_2+=<a href\="${actor1URL}"> ${actor1}</a> \u0914\u0930 ${actorCount - 1}  \u0926\u0942\u0938\u0930\u0947 \u0932\u094b\u0917\u094b\u0902  &quot;<a href\="${object1URL}">${object1}</a>&quot; \u0915\u093e \u0928\u092f\u093e \u0938\u0902\u0938\u094d\u0915\u0930\u0923 \u0905\u092a\u0932\u094b\u0921 \u0915\u093f\u092f\u093e \u0939\u0948
+ACTIVITY_CONTENT_REVISION_LINK_1=<a href\="${actor1URL}"> ${actor1}</a> \u0928\u0947 &quot;<a href\="${object1URL}">${object1}</a>&quot; \u0932\u093f\u0902\u0915 \u0938\u092e\u094d\u092a\u093e\u0926\u093f\u0924 \u0915\u093f\u092f\u093e
 ACTIVITY_CONTENT_REVISION_LINK_2=<a href\="${actor1URL}">${actor1}</a> \u0914\u0930 <a href\="${actor2URL}">${actor2}</a>\u0928\u0947 \u0932\u093f\u0902\u0915 &quot;<a href\="${object1URL}">${object1}</a>&quot;  \u0938\u0902\u092a\u093e\u0926\u093f\u0924 \u0915\u0940
 ACTIVITY_CONTENT_REVISION_LINK_2+=<a href\="${actor1URL}"> ${actor1}</a> \u0914\u0930 ${actorCount - 1} \u0905\u0928\u094d\u092f \u0932\u094b\u0917\u094b\u0902 \u0928\u0947 \u0932\u093f\u0902\u0915 &quot;<a href\="${object1URL}">${object1}</a> &quot; \u0938\u0902\u092a\u093e\u0926\u093f\u0924 \u0915\u0940
 ACTIVITY_CONTENT_SHARE_2=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947  &quot;<a href\="${object1URL}">${object1}</a>&quot; \u0914\u0930 &quot;<a href\="${object2URL}">${object2}</a>&quot; <a href\="${target1URL}">${target1}</a> \u0915\u0947 \u0938\u093e\u0925 \u0938\u093e\u0901\u091d\u093e \u0915\u093f\u092f\u093e \n
-ACTIVITY_CONTENT_SHARE_2+=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947 &quot;<a href\="${object1URL}">${object1}</a>&quot; \u0914\u0930 ${objectCount - 1} \u0905\u0928\u094d\u092f \u0932\u094b\u0917\u094b\u0902 \u0915\u094b <a href\="${target1URL}">${target1}</a> \u0915\u0947 \u0938\u093e\u0925 \u0938\u093e\u091d\u093e \u0915\u093f\u092f\u093e \u0939\u0948 
-ACTIVITY_CONTENT_SHARE_COLLABDOC_1=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947 <a href\="${target1URL}">${target1}</a> \u0915\u0947 \u0938\u093e\u0925 \u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u093c &quot;<a href\="${object1URL}">${object1}</a>&quot; \u0938\u093e\u091d\u093e \u0915\u093f\u092f\u093e 
-ACTIVITY_CONTENT_SHARE_COLLABDOC_2=<a href\="${actor1URL}">${actor1}</a>\u0928\u0947 <a href\="${target1URL}">${target1}</a> \u0914\u0930 <a href\="${target2URL}">${target2}</a> \u0915\u0947 \u0938\u093e\u0925 \u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u093c &quot;<a href\="${object1URL}">${object1}</a>&quot; \u0938\u093e\u091d\u093e \u0915\u093f\u092f\u093e 
+ACTIVITY_CONTENT_SHARE_2+=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947 &quot;<a href\="${object1URL}">${object1}</a>&quot; \u0914\u0930 ${objectCount - 1} \u0905\u0928\u094d\u092f \u0932\u094b\u0917\u094b\u0902 \u0915\u094b <a href\="${target1URL}">${target1}</a> \u0915\u0947 \u0938\u093e\u0925 \u0938\u093e\u091d\u093e \u0915\u093f\u092f\u093e \u0939\u0948
+ACTIVITY_CONTENT_SHARE_COLLABDOC_1=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947 <a href\="${target1URL}">${target1}</a> \u0915\u0947 \u0938\u093e\u0925 \u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u093c &quot;<a href\="${object1URL}">${object1}</a>&quot; \u0938\u093e\u091d\u093e \u0915\u093f\u092f\u093e
+ACTIVITY_CONTENT_SHARE_COLLABDOC_2=<a href\="${actor1URL}">${actor1}</a>\u0928\u0947 <a href\="${target1URL}">${target1}</a> \u0914\u0930 <a href\="${target2URL}">${target2}</a> \u0915\u0947 \u0938\u093e\u0925 \u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u093c &quot;<a href\="${object1URL}">${object1}</a>&quot; \u0938\u093e\u091d\u093e \u0915\u093f\u092f\u093e
 ACTIVITY_CONTENT_SHARE_COLLABDOC_2+=<a href\="${actor1URL}"> ${actor1}</a> \u0938\u093e\u091d\u093e &quot;<a href\="${object1URL}"> ${object1}</a>&quot; \u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u093c <a href\="${target1URL}"> ${target1}</a> \u0914\u0930 ${targetCount - 1} $ \u0905\u0928\u094d\u092f \u0915\u0947 \u0938\u093e\u0925
 ACTIVITY_CONTENT_SHARE_COLLABDOC_YOU=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947  &quot;<a href\="${object1URL}">${object1}</a>&quot; \u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u093c  \u0915\u094b \u0906\u092a \u0915\u0947 \u0938\u093e\u0925 \u0938\u093e\u091d\u093e \u0915\u093f\u092f\u093e \u0939\u0947
-ACTIVITY_CONTENT_SHARE_FILE_1=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947 &quot;<a href\="${object1URL}">${object1}</a>&quot; \u092b\u093c\u093e\u0907\u0932 \u0915\u094b <a href\="${target1URL}">${target1}</a> \u0915\u0947 \u0938\u093e\u0925 \u0938\u093e\u091d\u093e \u0915\u093f\u092f\u093e \u0939\u0947 
-ACTIVITY_CONTENT_SHARE_FILE_2=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947 &quot;<a href\="${object1URL}">${object1}</a>&quot; \u092b\u093c\u093e\u0907\u0932 \u0915\u094b <a href\="${target1URL}">${target1}</a> \u0914\u0930 <a href\="${target2URL}">${target2}</a> \u0915\u0947 \u0938\u093e\u0925 \u0938\u093e\u091d\u093e \u0915\u093f\u092f\u093e \u0939\u0947 
-ACTIVITY_CONTENT_SHARE_FILE_2+=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947 &quot;<a href\="${object1URL}">${object1}</a>&quot; \u092b\u093c\u093e\u0907\u0932 \u0915\u094b <a href\="${target1URL}">${target1}</a> \u0914\u0930 ${targetCount - 1} \u0905\u0928\u094d\u092f \u0932\u094b\u0917\u094b\u0902 \u0915\u0947 \u0938\u093e\u0925 \u0938\u093e\u091d\u093e \u0915\u093f\u092f\u093e \u0939\u0947 
+ACTIVITY_CONTENT_SHARE_FILE_1=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947 &quot;<a href\="${object1URL}">${object1}</a>&quot; \u092b\u093c\u093e\u0907\u0932 \u0915\u094b <a href\="${target1URL}">${target1}</a> \u0915\u0947 \u0938\u093e\u0925 \u0938\u093e\u091d\u093e \u0915\u093f\u092f\u093e \u0939\u0947
+ACTIVITY_CONTENT_SHARE_FILE_2=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947 &quot;<a href\="${object1URL}">${object1}</a>&quot; \u092b\u093c\u093e\u0907\u0932 \u0915\u094b <a href\="${target1URL}">${target1}</a> \u0914\u0930 <a href\="${target2URL}">${target2}</a> \u0915\u0947 \u0938\u093e\u0925 \u0938\u093e\u091d\u093e \u0915\u093f\u092f\u093e \u0939\u0947
+ACTIVITY_CONTENT_SHARE_FILE_2+=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947 &quot;<a href\="${object1URL}">${object1}</a>&quot; \u092b\u093c\u093e\u0907\u0932 \u0915\u094b <a href\="${target1URL}">${target1}</a> \u0914\u0930 ${targetCount - 1} \u0905\u0928\u094d\u092f \u0932\u094b\u0917\u094b\u0902 \u0915\u0947 \u0938\u093e\u0925 \u0938\u093e\u091d\u093e \u0915\u093f\u092f\u093e \u0939\u0947
 ACTIVITY_CONTENT_SHARE_FILE_YOU=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947  &quot;<a href\="${object1URL}">${object1}</a>&quot; \u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u093c  \u0915\u094b \u0906\u092a \u0915\u0947 \u0938\u093e\u0925 \u0938\u093e\u091d\u093e \u0915\u093f\u092f\u093e \u0939\u0947
 ACTIVITY_CONTENT_SHARE_LINK_1=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947 &quot;<a href\="${object1URL}">${object1}</a>&quot;  \u0932\u093f\u0902\u0915 \u0915\u094b <a href\="${target1URL}">${target1}</a>  \u0915\u0947 \u0938\u093e\u0925 \u0938\u093e\u091d\u093e \u0915\u093f\u092f\u093e \u0939\u0947
 ACTIVITY_CONTENT_SHARE_LINK_2=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947 &quot;<a href\="${object1URL}">${object1}</a>&quot; \u0932\u093f\u0902\u0915 \u0915\u094b <a href\="${target1URL}">${target1}</a> \u0914\u0930 <a href\="${target2URL}">${target2}</a> \u0915\u0947 \u0938\u093e\u0925 \u0938\u093e\u091d\u093e \u0915\u093f\u092f\u093e \u0939\u0947
 ACTIVITY_CONTENT_SHARE_LINK_2+=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947 &quot;<a href\="${object1URL}">${object1}</a>&quot; \u0932\u093f\u0902\u0915 \u0915\u094b <a href\="${target1URL}">${target1}</a> \u0914\u0930 ${targetCount - 1} \u0905\u0928\u094d\u092f \u0932\u094b\u0917\u094b\u0902 \u0915\u0947 \u0938\u093e\u0925 \u0938\u093e\u091d\u093e \u0915\u093f\u092f\u093e \u0939\u0947
 ACTIVITY_CONTENT_SHARE_LINK_YOU=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947  &quot;<a href\="${object1URL}">${object1}</a>&quot; \u0932\u093f\u0902\u0915 \u0915\u094b \u0906\u092a \u0915\u0947 \u0938\u093e\u0925 \u0938\u093e\u091d\u093e \u0915\u093f\u092f\u093e \u0939\u0947
-ACTIVITY_CONTENT_SHARE_YOU_2=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947  &quot;<a href\="${object1URL}">${object1}</a>&quot; \u0914\u0930 &quot;<a href\="${object2URL}">${object2}</a>&quot; \u0906\u092a \u0915\u0947 \u0938\u093e\u0925 \u0938\u093e\u091d\u093e \u0915\u093f\u092f\u093e \u0939\u0947 
-ACTIVITY_CONTENT_SHARE_YOU_2+=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947 &quot;<a href\="${object1URL}">${object1}</a>&quot; \u0914\u0930 ${objectCount - 1} \u0905\u0928\u094d\u092f \u0932\u094b\u0917\u094b\u0902 \u0915\u094b \u0906\u092a \u0915\u0947 \u0938\u093e\u0925 \u0938\u093e\u091d\u093e \u0915\u093f\u092f\u093e \u0939\u0947 
+ACTIVITY_CONTENT_SHARE_YOU_2=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947  &quot;<a href\="${object1URL}">${object1}</a>&quot; \u0914\u0930 &quot;<a href\="${object2URL}">${object2}</a>&quot; \u0906\u092a \u0915\u0947 \u0938\u093e\u0925 \u0938\u093e\u091d\u093e \u0915\u093f\u092f\u093e \u0939\u0947
+ACTIVITY_CONTENT_SHARE_YOU_2+=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947 &quot;<a href\="${object1URL}">${object1}</a>&quot; \u0914\u0930 ${objectCount - 1} \u0905\u0928\u094d\u092f \u0932\u094b\u0917\u094b\u0902 \u0915\u094b \u0906\u092a \u0915\u0947 \u0938\u093e\u0925 \u0938\u093e\u091d\u093e \u0915\u093f\u092f\u093e \u0939\u0947
 ACTIVITY_CONTENT_UPDATE_COLLABDOC_1=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947 &quot;<a href\="${object1URL}">${object1}</a>&quot; \u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u093c \u0915\u094b \u0905\u092a\u0921\u0947\u091f \u0915\u093f\u092f\u093e \u0939\u0947
 ACTIVITY_CONTENT_UPDATE_COLLABDOC_2=<a href\="${actor1URL}">${actor1}</a> \u0914\u0930 <a href\="${actor2URL}">${actor2}</a> \u0928\u0947 &quot;<a href\="${object1URL}">${object1}</a>&quot; \u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u093c \u0915\u094b \u0905\u092a\u0921\u0947\u091f \u0915\u093f\u092f\u093e \u0939\u0947
 ACTIVITY_CONTENT_UPDATE_COLLABDOC_2+=<a href\="${actor1URL}">${actor1}</a> \u0914\u0930 ${actorCount - 1} \u0905\u0928\u094d\u092f \u0932\u094b\u0917\u094b\u0902 \u0928\u0947 &quot;<a href\="${object1URL}">${object1}</a> &quot; \u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u093c \u0915\u094b \u0905\u092a\u0921\u0947\u091f \u0915\u093f\u092f\u093e \u0939\u0947
@@ -62,7 +62,7 @@ ACTIVITY_CONTENT_UPDATE_LINK_1=<a href\="${actor1URL}">${actor1}</a> \u0928\u094
 ACTIVITY_CONTENT_UPDATE_LINK_2=<a href\="${actor1URL}">${actor1}</a> \u0914\u0930 <a href\="${actor2URL}">${actor2}</a> \u0928\u0947 &quot;<a href\="${object1URL}">${object1}</a>&quot; \u0932\u093f\u0902\u0915 \u0915\u094b \u0905\u092a\u0921\u0947\u091f \u0915\u093f\u092f\u0947 \u0939\u0947
 ACTIVITY_CONTENT_UPDATE_LINK_2+=<a href\="${actor1URL}">${actor1}</a> \u0914\u0930 ${actorCount - 1} \u0905\u0928\u094d\u092f \u0932\u094b\u0917\u094b\u0902 \u0928\u0947 &quot;<a href\="${object1URL}">${object1}</a> &quot; \u0932\u093f\u0902\u0915 \u0915\u094b \u0905\u092a\u0921\u0947\u091f \u0915\u093f\u092f\u0947 \u0939\u0947
 ACTIVITY_CONTENT_UPDATE_MEMBER_ROLE_COLLABDOC_1=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947 &quot;<a href\="${target1URL}">${target1}</a>&quot; \u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u093c \u092e\u0947\u0902 <a href\="${object1URL}">${object1}</a>  \u0915\u0940 \u092d\u0942\u092e\u093f\u0915\u093e \u0915\u094b \u0905\u092a\u0921\u0947\u091f \u0915\u093f\u092f\u093e \u0939\u0947
-ACTIVITY_CONTENT_UPDATE_MEMBER_ROLE_COLLABDOC_2=<a href\="${actor1URL}">${actor1}</a>  \u0928\u0947 <a href\="${object1URL}">${object1}</a> \u0914\u0930 <a href\="${object2URL}">${object2}</a> \u0915\u0947 \u092d\u0942\u092e\u093f\u0915\u093e \u0915\u094b  &quot;<a href\="${target1URL}">${target1}</a>&quot; \u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c \u092a\u0930 \u0905\u092a\u0921\u0947\u091f \u0915\u093f\u092f\u093e \u0939\u0947| 
+ACTIVITY_CONTENT_UPDATE_MEMBER_ROLE_COLLABDOC_2=<a href\="${actor1URL}">${actor1}</a>  \u0928\u0947 <a href\="${object1URL}">${object1}</a> \u0914\u0930 <a href\="${object2URL}">${object2}</a> \u0915\u0947 \u092d\u0942\u092e\u093f\u0915\u093e \u0915\u094b  &quot;<a href\="${target1URL}">${target1}</a>&quot; \u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c \u092a\u0930 \u0905\u092a\u0921\u0947\u091f \u0915\u093f\u092f\u093e \u0939\u0947|
 ACTIVITY_CONTENT_UPDATE_MEMBER_ROLE_COLLABDOC_2+=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947 <a href\="${object1URL}">${object1}</a> \u0914\u0930 ${objectCount - 1} \u0905\u0928\u094d\u092f \u0932\u094b\u0917\u094b\u0902 \u0915\u093e \u092d\u0942\u092e\u093f\u0915\u093e \u0915\u094b  &quot;<a href\="${target1URL}">${target1}</a>&quot; \u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u093c \u092a\u0930 \u0905\u092a\u0921\u0947\u091f \u0915\u093f\u092f\u093e \u0939\u0947 \u0964
 ACTIVITY_CONTENT_UPDATE_MEMBER_ROLE_COLLABDOC_YOU=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947 &quot;<a href\="${target1URL}">${target1}</a>&quot; \u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u093c \u092a\u0930 \u0906\u092a\u0915\u0940 \u092d\u0942\u092e\u093f\u0915\u093e \u0915\u094b \u0905\u092a\u0921\u0947\u091f \u0915\u093f\u092f\u093e \u0939\u0947 \u0964
 ACTIVITY_CONTENT_UPDATE_MEMBER_ROLE_FILE_1=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947  &quot;<a href\="${target1URL}">${target1}</a>&quot; \u095e\u093e\u0907\u0932 \u092a\u0930 <a href\="${object1URL}">${object1}</a>  \u0915\u0940 \u092d\u0942\u092e\u093f\u0915\u093e \u0915\u094b \u0905\u092a\u0921\u0947\u091f \u0915\u093f\u092f\u093e \u0939\u0948\u0964
@@ -112,12 +112,12 @@ ACTIVITY_DISCUSSION_VISIBILITY_PRIVATE=<a href\="${actor1URL}">${actor1}</a> \u0
 ACTIVITY_DISCUSSION_VISIBILITY_PUBLIC=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947  &quot;<a href\="${object1URL}">${object1}</a>&quot;  \u091a\u0930\u094d\u091a\u093e \u0915\u0940 \u0926\u0943\u0936\u094d\u092f\u0924\u093e \u0915\u094b <strong>public</strong>  \u0915\u094b \u092c\u0926\u0932 \u0926\u093f\u092f\u093e \u0939\u0948\u0964
 ACTIVITY_FOLLOWING_1_1=<a href\="${actor1URL}">${actor1}</a> <a href\="${object1URL}">${object1}</a> \u092a\u093e\u0932\u0928 \u0915\u0930 \u0930\u0939\u093e \u0939\u0948
 ACTIVITY_FOLLOWING_1_2=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947 <a href\="${object1URL}">${object1}</a> \u0914\u0930 <a href\="${object2URL}">${object2}</a>  \u092a\u093e\u0932\u0928 \u0915\u0930 \u0930\u0939\u093e \u0939\u0948
-ACTIVITY_FOLLOWING_1_2+=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947 <a href\="${object1URL}">${object1}</a> \u0914\u0930 ${objectCount - 1} \u0905\u0928\u094d\u092f \u0932\u094b\u0917\u094b\u0902 \u092a\u0940\u091b\u093e \u0915\u0930 \u0930\u0939\u093e \u0939\u0948 
+ACTIVITY_FOLLOWING_1_2+=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947 <a href\="${object1URL}">${object1}</a> \u0914\u0930 ${objectCount - 1} \u0905\u0928\u094d\u092f \u0932\u094b\u0917\u094b\u0902 \u092a\u0940\u091b\u093e \u0915\u0930 \u0930\u0939\u093e \u0939\u0948
 ACTIVITY_FOLLOWING_1_YOU=<a href\="${actor1URL}">${actor1}</a> \u0906\u092a \u0915\u093e \u092a\u093e\u0932\u0928 \u0915\u0930 \u0930\u0939\u093e \u0939\u0948
 ACTIVITY_FOLLOWING_2_1=<a href\="${actor1URL}">${actor1}</a> \u0914\u0930 <a href\="${actor2URL}">${actor2}</a> \u0928\u0947 <a href\="${object1URL}">${object1}</a> \u0915\u093e \u0905\u0928\u0941\u0938\u0930\u0923 \u0915\u0930 \u0930\u0939\u0947 \u0939\u0948\u0902
-ACTIVITY_FOLLOWING_2+_1=<a href\="${actor1URL}">${actor1}</a> \u0914\u0930 ${actorCount - 1}  \u0905\u0928\u094d\u092f \u0932\u094b\u0917\u094b\u0902 <a href\="${object1URL}">${object1}</a> \u0905\u0928\u0941\u0938\u0930\u0923 \u0915\u0930 \u0930\u0939\u0947 \u0939\u0948\u0902 
-ACTIVITY_FOLLOWING_2_YOU=<a href\="${actor1URL}">${actor1}</a> \u0914\u0930 <a href\="${actor2URL}">${actor2}</a> \u0906\u092a \u0905\u0928\u0941\u0938\u0930\u0923 \u0915\u0930 \u0930\u0939\u0947 \u0939\u0948\u0902 
-ACTIVITY_FOLLOWING_2+_YOU=<a href\="${actor1URL}">${actor1}</a> \u0914\u0930 ${actorCount - 1} \u0905\u0928\u094d\u092f \u0932\u094b\u0917\u094b\u0902 \u0924\u0941\u092e\u094d\u0939\u0947\u0902 \u0905\u0928\u0941\u0938\u0930\u0923 \u0915\u0930 \u0930\u0939\u0947 \u0939\u0948\u0902 
+ACTIVITY_FOLLOWING_2+_1=<a href\="${actor1URL}">${actor1}</a> \u0914\u0930 ${actorCount - 1}  \u0905\u0928\u094d\u092f \u0932\u094b\u0917\u094b\u0902 <a href\="${object1URL}">${object1}</a> \u0905\u0928\u0941\u0938\u0930\u0923 \u0915\u0930 \u0930\u0939\u0947 \u0939\u0948\u0902
+ACTIVITY_FOLLOWING_2_YOU=<a href\="${actor1URL}">${actor1}</a> \u0914\u0930 <a href\="${actor2URL}">${actor2}</a> \u0906\u092a \u0905\u0928\u0941\u0938\u0930\u0923 \u0915\u0930 \u0930\u0939\u0947 \u0939\u0948\u0902
+ACTIVITY_FOLLOWING_2+_YOU=<a href\="${actor1URL}">${actor1}</a> \u0914\u0930 ${actorCount - 1} \u0905\u0928\u094d\u092f \u0932\u094b\u0917\u094b\u0902 \u0924\u0941\u092e\u094d\u0939\u0947\u0902 \u0905\u0928\u0941\u0938\u0930\u0923 \u0915\u0930 \u0930\u0939\u0947 \u0939\u0948\u0902
 ACTIVITY_GROUP_ADD_MEMBER_1=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947 <a href\="${object1URL}">${object1}</a> \u0915\u094b  \u0938\u092e\u0942\u0939 &quot;<a href\="${target1URL}">${target1}</a>&quot; \u092e\u0947\u0902 \u091c\u094b\u0921\u093c\u093e\u0964
 ACTIVITY_GROUP_ADD_MEMBER_2=<a href\="${actor1URL}">${actor1}</a>  \u0928\u0947 <a href\="${object1URL}">${object1}</a> \u0914\u0930 <a href\="${object2URL}">${object2}</a> \u0915\u0947  &quot;<a href\="${target1URL}">${target1}</a>&quot; \u0938\u092e\u0942\u0939 \u092e\u0947\u0902 \u091c\u094b\u0921\u093c\u093e\u0964
 ACTIVITY_GROUP_ADD_MEMBER_2+=<a href\="${actor1URL}">${actor1}</a> \u0928\u0947 <a href\="${object1URL}">${object1}</a> \u0914\u0930 ${objectCount - 1} \u0905\u0928\u094d\u092f \u0932\u094b\u0917\u094b\u0902 \u0915\u0947  &quot;<a href\="${target1URL}">${target1}</a>&quot;  \u0938\u092e\u0942\u0939 \u092e\u0947\u0902 \u091c\u094b\u0921\u093c\u093e\u0964
@@ -176,7 +176,7 @@ DISCUSSION_ACCESS_UPDATED=\u091a\u0930\u094d\u091a\u093e \u0905\u0928\u0941\u092
 DISCUSSION_DELETE_FAIL=\u091a\u0930\u094d\u091a\u093e \u0915\u094b \u0939\u091f\u093e\u092f\u093e \u0928\u0939\u0940\u0902 \u091c\u093e \u0938\u0915\u0924\u093e \u0939\u0948\u0964
 DISCUSSION_DELETE_SUCCESS=\u091a\u0930\u094d\u091a\u093e \u0939\u091f\u093e \u0926\u093f\u092f\u093e \u0917\u092f\u093e \u0939\u0948\u0964
 DISCUSSION_DELETED=\u091a\u0930\u094d\u091a\u093e \u0939\u091f\u093e \u0926\u093f\u092f\u093e\u0964
-DISCUSSION_LOGGEDIN_DESCRIPTION=\u091a\u0930\u094d\u091a\u093e \u0915\u094b ${tenant} \u092e\u0947\u0902 \u0938\u092d\u0940 \u0928\u0947 \u0926\u0947\u0916\u093e \u0914\u0930 \u092a\u093e\u092f\u093e \u091c\u093e \u0938\u0915\u0924\u093e \u0939\u0948 
+DISCUSSION_LOGGEDIN_DESCRIPTION=\u091a\u0930\u094d\u091a\u093e \u0915\u094b ${tenant} \u092e\u0947\u0902 \u0938\u092d\u0940 \u0928\u0947 \u0926\u0947\u0916\u093e \u0914\u0930 \u092a\u093e\u092f\u093e \u091c\u093e \u0938\u0915\u0924\u093e \u0939\u0948
 DISCUSSION_NAME=\u091a\u0930\u094d\u091a\u093e \u0936\u0940\u0930\u094d\u0937\u0915
 DISCUSSION_NOT_DELETED=\u091a\u0930\u094d\u091a\u093e\u090f\u0901 \u0928\u0939\u0940\u0902 \u0928\u0937\u094d\u091f \u0915\u0930 \u0926\u093f\u092f\u093e\u0964
 DISCUSSION_PRIVATE_DESCRIPTION=\u091a\u0930\u094d\u091a\u093e \u0928\u093f\u091c\u0940 \u0914\u0930 \u0915\u0947\u0935\u0932 \u0905\u092a\u0928\u0947 \u0938\u0926\u0938\u094d\u092f\u094b\u0902 \u0914\u0930 \u0938\u092e\u0942\u0939\u094b\u0902 \u0915\u0947 \u0932\u093f\u090f \u0926\u0943\u0936\u094d\u092f\u092e\u093e\u0928 \u0939\u094b \u091c\u093e\u090f\u0917\u093e
@@ -191,7 +191,7 @@ DOCUMENT_ACCESS_UPDATED=\u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u093c \
 DOCUMENT_DELETE_FAIL=\u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u093c \u0915\u094b \u0939\u091f\u093e\u092f\u093e \u0928\u0939\u0940\u0902 \u091c\u093e \u0938\u0915\u0924\u093e \u0939\u0948\u0964
 DOCUMENT_DELETE_SUCCESS=\u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u093c \u0938\u092b\u0932\u0924\u093e\u092a\u0942\u0930\u094d\u0935\u0915 \u0939\u091f\u093e \u0926\u093f\u092f\u093e \u0917\u092f\u093e \u0939\u0948\u0964
 DOCUMENT_DELETED=\u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u093c \u0939\u091f\u093e \u0926\u093f\u092f\u093e\u0964
-DOCUMENT_LOGGEDIN_DESCRIPTION=\u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u093c \u0915\u094b ${tenant} \u092e\u0947\u0902 \u0938\u092d\u0940 \u0928\u0947 \u0926\u0947\u0916\u093e \u0914\u0930 \u092a\u093e\u092f\u093e \u091c\u093e \u0938\u0915\u0924\u093e \u0939\u0948 
+DOCUMENT_LOGGEDIN_DESCRIPTION=\u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u093c \u0915\u094b ${tenant} \u092e\u0947\u0902 \u0938\u092d\u0940 \u0928\u0947 \u0926\u0947\u0916\u093e \u0914\u0930 \u092a\u093e\u092f\u093e \u091c\u093e \u0938\u0915\u0924\u093e \u0939\u0948
 DOCUMENT_NOT_DELETED=\u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u093c \u0928\u0939\u0940\u0902 \u0928\u0937\u094d\u091f \u0915\u0930 \u0926\u093f\u092f\u093e\u0964
 DOCUMENT_PRIVATE_DESCRIPTION=\u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u093c \u0928\u093f\u091c\u0940 \u0914\u0930 \u0915\u0947\u0935\u0932 \u0905\u092a\u0928\u0947 \u0938\u0926\u0938\u094d\u092f\u094b\u0902 \u0914\u0930 \u0938\u092e\u0942\u0939\u094b\u0902 \u0915\u0947 \u0932\u093f\u090f \u0926\u0943\u0936\u094d\u092f\u092e\u093e\u0928 \u0939\u094b \u091c\u093e\u090f\u0917\u093e
 DOCUMENT_PUBLIC_DESCRIPTION=\u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u093c \u0938\u093e\u0930\u094d\u0935\u091c\u0928\u093f\u0915 \u0939\u0948 \u0914\u0930 \u0915\u093f\u0938\u0940 \u0915\u0947 \u0926\u094d\u0935\u093e\u0930\u093e \u0916\u094b\u091c \u0915\u0940 \u0939\u0948 \u0914\u0930 \u0926\u0947\u0916\u093e \u091c\u093e \u0938\u0915\u0924\u093e \u0939\u0948
@@ -231,7 +231,7 @@ GROUP_JOIN_FAILED=\u0938\u092e\u0942\u0939 \u092e\u0947\u0902 \u0928\u0939\u0940
 GROUP_JOIN_SUCCESS=\u0906\u092a \u0938\u092b\u0932\u0924\u093e\u092a\u0942\u0930\u094d\u0935\u0915 \u0907\u0938 \u0938\u092e\u0942\u0939 \u092e\u0947\u0902 \u0936\u093e\u092e\u093f\u0932 \u0939\u094b \u0917\u090f\u0964
 GROUP_JOINED=\u0938\u092e\u0942\u0939 \u092e\u0947\u0902 \u0936\u093e\u092e\u093f\u0932 \u0939\u094b \u0917\u090f\u0964
 GROUP_LOGGEDIN_DESCRIPTION=\u0932\u093f\u0902\u0915 \u0915\u094b ${tenant} \u092e\u0947\u0902 \u0938\u092d\u0940 \u0928\u0947 \u0926\u0947\u0916\u093e \u0914\u0930 \u092a\u093e\u092f\u093e \u091c\u093e \u0938\u0915\u0924\u093e \u0939\u0948
-GROUP_MEMBERS=\u0938\u092e\u0942\u0939 \u0915\u0947 \u0938\u0926\u0938\u094d\u092f\u094b\u0902 
+GROUP_MEMBERS=\u0938\u092e\u0942\u0939 \u0915\u0947 \u0938\u0926\u0938\u094d\u092f\u094b\u0902
 GROUP_NOT_JOINED=\u0907\u0938 \u0938\u092e\u0942\u0939 \u092e\u0947\u0902 \u0936\u093e\u092e\u093f\u0932 \u0928\u0939\u0940\u0902 \u0915\u093f\u092f\u093e \u091c\u093e \u0938\u0915\u0924\u093e \u0939\u0948\u0964
 GROUP_PRIVATE_DESCRIPTION=\u0938\u092e\u0942\u0939 \u0928\u093f\u091c\u0940 \u0914\u0930 \u0915\u0947\u0935\u0932 \u0905\u092a\u0928\u0947 \u0938\u0926\u0938\u094d\u092f\u094b\u0902 \u0915\u0947 \u0932\u093f\u090f \u0926\u0943\u0936\u094d\u092f\u092e\u093e\u0928 \u0939\u094b \u091c\u093e\u090f\u0917\u093e
 GROUP_PRIVATE_DESCRIPTION_PRESENT=\u0938\u092e\u0942\u0939 \u0928\u093f\u091c\u0940 \u0914\u0930 \u0915\u0947\u0935\u0932 \u0905\u092a\u0928\u0947 \u0938\u0926\u0938\u094d\u092f\u094b\u0902 \u0915\u0947 \u0932\u093f\u090f \u0926\u093f\u0916 \u0930\u0939\u093e \u0939\u0948
@@ -252,7 +252,7 @@ JQUERY_TIMEAGO_HOURS=%d \u0918\u0902\u091f\u0947 \u0915\u0947 \u092c\u093e\u0930
 JQUERY_TIMEAGO_MINUTE=\u090f\u0915 \u092e\u093f\u0928\u091f \u0915\u0947 \u092c\u093e\u0930\u0947 \u092e\u0947\u0902
 JQUERY_TIMEAGO_MINUTES=%d \u092e\u093f\u0928\u091f
 JQUERY_TIMEAGO_MONTH=\u090f\u0915 \u092e\u0939\u0940\u0928\u0947 \u0915\u0947 \u092c\u093e\u0930\u0947 \u092e\u0947\u0902
-JQUERY_TIMEAGO_MONTHS=%d \u092e\u0939\u0940\u0928\u0947 \u0915\u0947 
+JQUERY_TIMEAGO_MONTHS=%d \u092e\u0939\u0940\u0928\u0947 \u0915\u0947
 JQUERY_TIMEAGO_SECONDS=\u0915\u092e \u0938\u0947 \u0915\u092e \u090f\u0915 \u092e\u093f\u0928\u091f
 JQUERY_TIMEAGO_SUFFIXAGO=\u092a\u0939\u0932\u0947
 JQUERY_TIMEAGO_SUFFIXFROMNOW=\u0905\u092c \u0938\u0947
@@ -269,7 +269,7 @@ LINK_ADDED=\u0932\u093f\u0902\u0915 \u091c\u094b\u0921\u093c\u093e\u0964
 LINK_DELETE_FAIL=\u0932\u093f\u0902\u0915 \u0939\u091f\u093e\u092f\u093e \u0928\u0939\u0940\u0902 \u091c\u093e \u0938\u0915\u093e\u0964
 LINK_DELETE_SUCCESS=\u0932\u093f\u0902\u0915 \u0938\u092b\u0932\u0924\u093e\u092a\u0942\u0930\u094d\u0935\u0915 \u0939\u091f\u093e \u0926\u093f\u092f\u093e \u0917\u092f\u093e \u0939\u0948\u0964
 LINK_DELETED=\u0932\u093f\u0902\u0915 \u0939\u091f\u093e\u092f\u093e\u0964
-LINK_LOGGEDIN_DESCRIPTION=\u0932\u093f\u0902\u0915 \u0915\u094b ${tenant} \u092e\u0947\u0902 \u0938\u092d\u0940 \u0928\u0947 \u0926\u0947\u0916\u093e \u0914\u0930 \u092a\u093e\u092f\u093e \u091c\u093e \u0938\u0915\u0924\u093e \u0939\u0948 
+LINK_LOGGEDIN_DESCRIPTION=\u0932\u093f\u0902\u0915 \u0915\u094b ${tenant} \u092e\u0947\u0902 \u0938\u092d\u0940 \u0928\u0947 \u0926\u0947\u0916\u093e \u0914\u0930 \u092a\u093e\u092f\u093e \u091c\u093e \u0938\u0915\u0924\u093e \u0939\u0948
 LINK_NOT_ADDED=\u0932\u093f\u0902\u0915 \u0928\u0939\u0940\u0902 \u091c\u094b\u0921\u093c\u093e \u0917\u092f\u093e\u0964
 LINK_NOT_DELETED=\u0932\u093f\u0902\u0915 \u0939\u091f\u093e\u092f\u093e \u0928\u0939\u0940\u0902\u0964
 LINK_PRIVATE_DESCRIPTION=\u0932\u093f\u0902\u0915 \u0928\u093f\u091c\u0940 \u0914\u0930 \u0907\u0938\u0915\u0947 \u0938\u093e\u0925 \u0938\u093e\u091d\u093e \u0915\u093f\u092f\u093e \u091c\u093e\u0924\u093e \u0939\u0948 \u0909\u092a\u092f\u094b\u0917\u0915\u0930\u094d\u0924\u093e\u0913\u0902 \u0914\u0930 \u0938\u092e\u0942\u0939\u094b\u0902 \u0915\u094b \u0939\u0940 \u0926\u093f\u0916\u093e\u0908 \u0926\u0947 \u0930\u0939\u093e \u0939\u0948
@@ -301,7 +301,6 @@ OAE=\u0916\u0941\u0932\u093e \u0936\u0948\u0915\u094d\u0937\u093f\u0915 \u0935\u
 OR=\u092f\u093e
 OTHER_DOCUMENT=\u0905\u0928\u094d\u092f \u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u093c
 PAGE_NOT_FOUND=\u092a\u0943\u0937\u094d\u0920 \u0928\u0939\u0940\u0902 \u092e\u093f\u0932\u093e
-PARTICIPANTS_ONLY=\u0915\u0947\u0935\u0932 \u092a\u094d\u0930\u0924\u093f\u092d\u093e\u0917\u093f\u092f\u094b\u0902 
 PARTICIPATING_IN_DISCUSSIONS_AND_FEEDBACK_WITHIN_PERSONALIZED_NETWORKS=\u092a\u094d\u0930\u094b\u091c\u0947\u0915\u094d\u091f \u091f\u0940\u092e\u094b\u0902 \u0915\u0947 \u0938\u0939\u092f\u094b\u0917 \u0914\u0930 \u0938\u0902\u0935\u093e\u0926 \u0915\u0947 \u0930\u0942\u092a \u092e\u0947\u0902 \u0935\u093f\u091a\u093e\u0930 \u0935\u093f\u092e\u0930\u094d\u0936 \u0914\u0930 \u0935\u094d\u092f\u0915\u094d\u0924\u093f\u0917\u0924 \u0928\u0947\u091f\u0935\u0930\u094d\u0915 \u0938\u0902\u0938\u093e\u0927\u0928\u094b\u0902 \u0914\u0930 \u0932\u094b\u0917\u094b\u0902 \u0915\u0947 \u092d\u0940\u0924\u0930 \u092a\u094d\u0930\u0924\u093f\u0915\u094d\u0930\u093f\u092f\u093e \u092e\u0947\u0902 \u092d\u093e\u0917 \u0932\u0947\u0928\u0947, \u0938\u0940\u0916\u0928\u0947 \u0915\u094b \u0906\u0917\u0947\u0964
 PASSWORD=\u092a\u093e\u0938\u0935\u0930\u094d\u0921
 PASSWORD_COLON=\u092a\u093e\u0938\u0935\u0930\u094d\u0921\:
diff --git a/ui/bundles/it_IT.properties b/ui/bundles/it_IT.properties
index fd08ca07f91..e2569050dd2 100644
--- a/ui/bundles/it_IT.properties
+++ b/ui/bundles/it_IT.properties
@@ -247,7 +247,6 @@ OAE=Ambiente Accademico Aperto
 OR=o
 OTHER_DOCUMENT=Altro documento
 PAGE_NOT_FOUND=Pagina non trovata
-PARTICIPANTS_ONLY=Solo partecipanti
 PARTICIPATING_IN_DISCUSSIONS_AND_FEEDBACK_WITHIN_PERSONALIZED_NETWORKS=Partecipare alle discussioni e ai feedback nelle reti personalizzate di risorse e persone, promuove l'apprendimento come gruppo di lavoro, collaborazione e comunicazione.
 PDF_DOCUMENT=Documento PDF
 PEOPLE=Persone
diff --git a/ui/bundles/nl_NL.properties b/ui/bundles/nl_NL.properties
index 63dd1541633..21ece6f8325 100644
--- a/ui/bundles/nl_NL.properties
+++ b/ui/bundles/nl_NL.properties
@@ -281,6 +281,7 @@ MANAGER=Beheerder
 MARKDOWN=Markdown
 MEMBER=Deelnemer
 MEMBERS=Deelnemers
+MEMBERS_ONLY = Alleen deelnemers
 MY_ACCOUNT=Mijn account
 MY_DISCUSSIONS=Mijn discussies
 MY_GROUPS=Mijn groepen
@@ -301,7 +302,6 @@ OAE=Open Academic Environment
 OR=of
 OTHER_DOCUMENT=Ander document
 PAGE_NOT_FOUND=Pagina niet gevonden
-PARTICIPANTS_ONLY=Alleen deelnemers
 PARTICIPATING_IN_DISCUSSIONS_AND_FEEDBACK_WITHIN_PERSONALIZED_NETWORKS=Deelnemen in discussies en feedback binnen gepersonaliseerde netwerken van mensen en bronnen versterkt leren door samenwerking en communicatie.
 PASSWORD=Wachtwoord
 PASSWORD_COLON=Wachtwoord\:
@@ -371,6 +371,7 @@ THIS_FIELD_IS_REQUIRED=Dit veld is verplicht
 THIS_PASSWORD_DOES_NOT_MATCH_THE_FIRST_ONE=De wachtwoorden komen niet overeen
 TITLE=Titel
 TITLE_PREFIX=Open Academic Environment
+TOGGLE_NAVIGATION = Navigatie
 UNFOLLOW=Stop met volgen
 UPDATE=Bijwerken
 UPLOAD=Uploaden
diff --git a/ui/bundles/pl_PL.properties b/ui/bundles/pl_PL.properties
index b42a9c9955e..1b7c57526f7 100644
--- a/ui/bundles/pl_PL.properties
+++ b/ui/bundles/pl_PL.properties
@@ -257,7 +257,6 @@ OAE=Otwarte \u015arodowisko Akademickie
 OR=lub
 OTHER_DOCUMENT=Inny dokument
 PAGE_NOT_FOUND=Nie znaleziono strony
-PARTICIPANTS_ONLY=Tylko uczestnicy
 PARTICIPATING_IN_DISCUSSIONS_AND_FEEDBACK_WITHIN_PERSONALIZED_NETWORKS=Uczestniczenie w dyskusjach i ocenianie w ramach spersonalizowanych sieci zasob\u00f3w i ludzi wspomagaj\u0105ce nauk\u0119 poprzez wsp\u00f3\u0142prac\u0119 i komunikacj\u0119 w zespo\u0142ach projektowych.
 PASSWORD=Has\u0142o
 PASSWORD_COLON=Has\u0142o\:
diff --git a/ui/bundles/ru_RU.properties b/ui/bundles/ru_RU.properties
index 3a801d3fedc..7609f1ce594 100644
--- a/ui/bundles/ru_RU.properties
+++ b/ui/bundles/ru_RU.properties
@@ -58,7 +58,6 @@ NO_SPACES_ARE_ALLOWED=\u041d\u0435\u0442 \u0434\u043e\u0441\u0442\u0443\u043f\u0
 OR=\u0438\u043b\u0438
 OTHER_DOCUMENT=\u0414\u0440\u0443\u0433\u043e\u0439 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442
 PAGE_NOT_FOUND=\u0421\u0442\u0440\u0430\u043d\u0438\u0446\u0430 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u0430
-PARTICIPANTS_ONLY=\u0423\u0447\u0430\u0441\u0442\u043d\u0438\u043a\u0438
 PASSWORD=\u041f\u0430\u0440\u043e\u043b\u044c
 PDF_DOCUMENT=\u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442 PDF
 PEOPLE=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438
diff --git a/ui/bundles/sv_SE.properties b/ui/bundles/sv_SE.properties
index e75f8eebae8..0dd8cac8399 100644
--- a/ui/bundles/sv_SE.properties
+++ b/ui/bundles/sv_SE.properties
@@ -301,7 +301,6 @@ OAE=\u00d6ppna akademiska milj\u00f6n
 OR=eller
 OTHER_DOCUMENT=Andra dokument
 PAGE_NOT_FOUND=Sidan kunde inte hittas
-PARTICIPANTS_ONLY=Endast deltagare
 PARTICIPATING_IN_DISCUSSIONS_AND_FEEDBACK_WITHIN_PERSONALIZED_NETWORKS=Deltagande i diskussioner och feedback inom personliga n\u00e4tverk av resurser och m\u00e4nniskor fr\u00e4mjar l\u00e4rande d\u00e5 projektgrupper samarbetar och kommunicerar.
 PASSWORD=L\u00f6senord
 PASSWORD_COLON=L\u00f6senord\:
diff --git a/ui/bundles/val_ES.properties b/ui/bundles/val_ES.properties
index 1a53f22ced9..7df8e96febe 100644
--- a/ui/bundles/val_ES.properties
+++ b/ui/bundles/val_ES.properties
@@ -301,7 +301,6 @@ OAE=Ambiente academic obert
 OR=o
 OTHER_DOCUMENT=Altre document
 PAGE_NOT_FOUND=Patgina no trobada
-PARTICIPANTS_ONLY=Soles participants
 PARTICIPATING_IN_DISCUSSIONS_AND_FEEDBACK_WITHIN_PERSONALIZED_NETWORKS=Participar en els f\u00f2rums i comentaris en les xarxes personalitzades dels recursos i les persones, promou l'aprenentatge com els equips de projectes col\u00b7laborar i comunicar-se.
 PASSWORD=Contrasenya
 PASSWORD_COLON=contrasenya\:
diff --git a/ui/bundles/zh_CN.properties b/ui/bundles/zh_CN.properties
index 601094b4652..95a9c86582d 100644
--- a/ui/bundles/zh_CN.properties
+++ b/ui/bundles/zh_CN.properties
@@ -301,7 +301,6 @@ OAE=\u5f00\u653e\u5b66\u672f\u73af\u5883
 OR=\u6216
 OTHER_DOCUMENT=\u5176\u5b83\u6587\u6863
 PAGE_NOT_FOUND=\u9875\u9762\u672a\u627e\u5230
-PARTICIPANTS_ONLY=\u4ec5\u9650\u53c2\u4e0e\u8005
 PARTICIPATING_IN_DISCUSSIONS_AND_FEEDBACK_WITHIN_PERSONALIZED_NETWORKS=\u5728\u4e2a\u6027\u5316\u7684\u7f51\u7edc\u8d44\u6e90\u548c\u7528\u6237\u7fa4\u4e2d\u53c2\u4e0e\u8ba8\u8bba\u548c\u63d0\u4f9b\u53cd\u9988; \u8fdb\u4e00\u6b65\u901a\u8fc7\u4e0e\u9879\u76ee\u56e2\u961f\u7684\u534f\u4f5c\u548c\u6c9f\u901a\u6765\u52a0\u5f3a\u5b66\u4e60
 PASSWORD=\u5bc6\u7801
 PASSWORD_COLON=\u5bc6\u7801
diff --git a/ui/content.html b/ui/content.html
index bba87fe8bbe..a4296486219 100644
--- a/ui/content.html
+++ b/ui/content.html
@@ -2,6 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
 
+        <meta name="viewport" content="width=device-width, user-scalable=no">
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
         <noscript>
@@ -11,6 +12,8 @@
         <!-- CORE CSS -->
         <link rel="stylesheet" type="text/css" href="/shared/oae/css/oae.core.css" />
         <link rel="stylesheet" type="text/css" href="/api/ui/skin" />
+        <!-- PAGE CSS -->
+        <link rel="stylesheet" type="text/css" href="/ui/css/oae.content.css" />
 
     </head>
     <body>
@@ -19,7 +22,7 @@
         <div data-widget="topnavigation"><!-- --></div>
 
         <!-- BODY -->
-        <div class="oae-main-content">
+        <main class="oae-main-content" role="main">
 
             <!-- CLIPS -->
             <div class="oae-clip-container">
@@ -37,7 +40,7 @@
                                     <div>
                                         <h1 class="oae-threedots">${content.displayName|encodeForHTML}</h1>
                                         <i class="icon-caret-down"></i>
-                                        <small>${oae.api.content.getMimeTypeDescription(content)}</small>
+                                        <small class="oae-threedots">${oae.api.content.getMimeTypeDescription(content)}</small>
                                     </div>
                                 </div>
                             </button>
@@ -59,7 +62,7 @@ <h1 class="oae-threedots">${content.displayName|encodeForHTML}</h1>
                     </div>
                 --></div>
 
-                <div id="content-actions-clip-container" class="oae-clip-container-right"><!-- --></div>
+                <div id="content-actions-clip-container" class="hidden-xs hidden-sm oae-clip-container-right"><!-- --></div>
                 <div id="content-actions-clip-template"><!--
                     {if content.canShare}
                         <div class="oae-clip oae-clip-flipped">
@@ -95,9 +98,10 @@ <h1>__MSG__COMMENT__</h1>
                 --></div>
             </div>
 
-            <div id="content-preview-container"><!-- --></div>
-            <div data-widget="comments"><!-- --></div>
-        </div>
+            <!-- NAVIGATION -->
+            <div data-widget="lhnavigation"><!-- --></div>
+
+        </main>
 
         <!-- FOOTER -->
         <div data-widget="footer"><!-- --></div>
diff --git a/ui/css/oae.content.css b/ui/css/oae.content.css
new file mode 100644
index 00000000000..94f14896ddf
--- /dev/null
+++ b/ui/css/oae.content.css
@@ -0,0 +1,25 @@
+/*!
+ * Copyright 2013 Apereo Foundation (AF) Licensed under the
+ * Educational Community License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may
+ * obtain a copy of the License at
+ *
+ *     http://opensource.org/licenses/ECL-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS"
+ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/* The content page shouldn't have a left hand navigation when wider than 992 pixels */
+@media (min-width: 992px) {
+    .oae-lhnavigation {
+        display: none;
+    }
+
+    .oae-page {
+        padding: 5px 25px 50px !important;
+    }
+}
diff --git a/ui/css/oae.discussion.css b/ui/css/oae.discussion.css
index 604fc1ef291..321e6642425 100644
--- a/ui/css/oae.discussion.css
+++ b/ui/css/oae.discussion.css
@@ -13,6 +13,13 @@
  * permissions and limitations under the License.
  */
 
-#discussion-topic {
-    margin: 80px 65px 40px 50px;
+/* The discussion page shouldn't have a left hand navigation when wider than 992 pixels */
+@media (min-width: 992px) {
+    .oae-lhnavigation {
+        display: none;
+    }
+
+    .oae-page {
+        padding: 5px 25px 50px !important;
+    }
 }
diff --git a/ui/css/oae.index.css b/ui/css/oae.index.css
index 7985cef2ce0..32f98baee6d 100644
--- a/ui/css/oae.index.css
+++ b/ui/css/oae.index.css
@@ -16,7 +16,11 @@
 #index-content {
     font-weight: 200;
     margin: 0 auto;
-    min-width: 878px;
+    max-width: 985px;
+}
+
+#index-container > div {
+    margin: 0 auto;
     max-width: 985px;
 }
 
@@ -29,31 +33,34 @@
     padding: 10px 20px;
 }
 
-#index-container .index-search-container {
-    margin: 25px auto 50px;
-    padding: 3% 0;
+#index-container .row {
+    margin: 30px 0 0;
 }
 
-#index-container .index-search-container form {
-    margin: 0;
+#index-container .index-search-container form,
+#index-container .index-search-container form .form-group {
+    margin: 12px 0;
 }
 
 #index-container .index-search-container input#index-search-query {
     height: 37px;
-    margin-left: 80px;
-    margin-right: 7px;
-    border-color: transparent;
-    -webkit-box-shadow: none;
-       -moz-box-shadow: none;
-            box-shadow: none;
+    padding: 0 30px 0 12px;
+}
+
+#index-container .index-search-container #index-search-icon {
+    margin-left: -27px;
+    margin-top: 1px;
+    padding: 0px;
+    opacity: 0.6;
 }
 
 #index-container .index-search-container button[type="submit"] {
     height: 37px;
+    margin-top: -3px;
     padding: 0px 19px;
 }
 
-#index-container #index-video-container {
+#index-container #index-video {
     position: relative;
     background: url('/ui/img/index-video-bg.png') no-repeat center 0px #ECEAE5;
     -webkit-border-radius: 3px;
@@ -63,9 +70,14 @@
        -moz-box-shadow: 0 0 7px #444;
             box-shadow: 0 0 7px #444;
     height: 290px;
+    padding: 0;
+}
+
+#index-container #index-video.index-video-mobile {
+    height: 130px;
 }
 
-#index-container #index-video-container #index-video-launch {
+#index-container #index-video #index-video-launch {
     position: absolute;
     opacity: 0.8;
     left: 0;
@@ -73,7 +85,7 @@
     height: 100%;
 }
 
-#index-container #index-video-container #index-video-launch i {
+#index-container #index-video #index-video-launch i {
     font-size: 70px;
 }
 
@@ -81,17 +93,12 @@
     font-size: 50px;
     line-height: 1;
     margin: 0;
+    word-wrap: break-word;
 }
 
 #index-container #index-slogan-description {
     font-size: 19px;
     margin-top: 25px;
-    width: 350px;
-}
-
-.index-bottom {
-    margin-top: 30px;
-    margin-bottom: 30px;
 }
 
 .index-bottom .index-bottom-slogan {
@@ -105,3 +112,19 @@
     margin-top: 25px;
     overflow: auto;
 }
+
+@media (max-width: 992px) {
+    #index-content .row:last-child {
+        margin-top: 0;
+    }
+
+    #index-container #index-slogan {
+        font-size: 40px;
+    }
+}
+
+@media (max-width: 480px) {
+    #index-container #index-slogan {
+        font-size: 34px;
+    }
+}
diff --git a/ui/css/oae.search.css b/ui/css/oae.search.css
index fdc1db0f2ca..3e8d8287315 100644
--- a/ui/css/oae.search.css
+++ b/ui/css/oae.search.css
@@ -19,21 +19,35 @@
     padding: 15px;
 }
 
-#search-clip-container .oae-clip-content #search-form {
-    margin: 0 20px 0 10px;
-}
-
-#search-clip-container .oae-clip-content .search-query {
-    margin-left: 10px;
-    margin-right: 20px;
+#search-clip-container .oae-clip {
+    margin-left: 3px;
 }
 
 /* Search container */
 
 #search-content-container {
-    padding: 10px;
+    padding: 5px 10px;
+}
+
+/* Search form */
+
+#search-form {
+    margin: 0 20px;
+}
+
+#search-form #search-search-icon {
+    margin-left: -27px;
+    margin-top: 5px;
+    padding: 0px;
+    opacity: 0.6;
+}
+
+#search-form #search-query {
+    padding: 0 30px 0 12px;
 }
 
-#search-content-container #search-list-container {
-    padding: 5px 75px 50px 0px;
+@media (max-width: 480px) {
+    .oae-list-options-actions {
+        display: none !important;
+    }
 }
diff --git a/ui/discussion.html b/ui/discussion.html
index 9f789dc6016..b5d1fed0ad5 100644
--- a/ui/discussion.html
+++ b/ui/discussion.html
@@ -2,6 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
 
+        <meta name="viewport" content="width=device-width, user-scalable=no">
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
         <noscript>
@@ -11,6 +12,7 @@
         <!-- CORE CSS -->
         <link rel="stylesheet" type="text/css" href="/shared/oae/css/oae.core.css" />
         <link rel="stylesheet" type="text/css" href="/api/ui/skin" />
+
         <!-- PAGE CSS -->
         <link rel="stylesheet" type="text/css" href="/ui/css/oae.discussion.css" />
 
@@ -21,7 +23,7 @@
         <div data-widget="topnavigation"><!-- --></div>
 
         <!-- BODY -->
-        <div class="oae-main-content">
+        <main class="oae-main-content" role="main">
 
             <!-- CLIPS -->
             <div class="oae-clip-container">
@@ -39,7 +41,7 @@
                                     <div>
                                         <h1 class="oae-threedots">${discussion.displayName|encodeForHTML}</h1>
                                         <i class="icon-caret-down"></i>
-                                        <small>__MSG__DISCUSSION__</small>
+                                        <small class="oae-threedots">__MSG__DISCUSSION__</small>
                                     </div>
                                 </div>
                             </button>
@@ -57,7 +59,7 @@ <h1 class="oae-threedots">${discussion.displayName|encodeForHTML}</h1>
                 <div id="discussion-actions-clip-container" class="oae-clip-container-right"><!-- --></div>
                 <div id="discussion-actions-clip-template"><!--
                     {if discussion.canShare}
-                        <div class="oae-clip oae-clip-flipped">
+                        <div class="hidden-xs hidden-sm oae-clip oae-clip-flipped">
                             <div class="oae-clip-fold">
                                 <div class="oae-clip-fold-inner"></div>
                                 <div class="oae-clip-fold-outer"></div>
@@ -73,7 +75,7 @@ <h1>__MSG__SHARE__</h1>
                         </div>
                     {/if}
 
-                    <div class="oae-clip oae-clip-secondary oae-clip-flipped">
+                    <div class="hidden-xs hidden-sm oae-clip oae-clip-secondary oae-clip-flipped">
                         <div class="oae-clip-fold">
                             <div class="oae-clip-fold-inner"></div>
                             <div class="oae-clip-fold-outer"></div>
@@ -90,16 +92,10 @@ <h1>__MSG__COMMENT__</h1>
                 --></div>
             </div>
 
-            <!-- DISCUSSION TOPIC -->
-            <div id="discussion-topic-container" class="hide">
-                <div id="discussion-topic" class="well"><!-- --></div>
-            </div>
+            <!-- NAVIGATION -->
+            <div data-widget="lhnavigation"><!-- --></div>
 
-            <!-- DISCUSSION -->
-            <div class="comments-container">
-                <div data-widget="comments"><!-- --></div>
-            </div>
-        </div>
+        </main>
 
         <!-- FOOTER -->
         <div data-widget="footer"><!-- --></div>
diff --git a/ui/group.html b/ui/group.html
index 1a709f28029..52f5614f0e9 100644
--- a/ui/group.html
+++ b/ui/group.html
@@ -2,6 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
 
+        <meta name="viewport" content="width=device-width, user-scalable=no">
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
         <noscript>
@@ -21,7 +22,7 @@
         <div data-widget="topnavigation"><!-- --></div>
 
         <!-- BODY -->
-        <div class="oae-main-content">
+        <main class="oae-main-content" role="main">
 
             <!-- CLIPS -->
             <div class="oae-clip-container">
@@ -39,7 +40,7 @@
                                     <div>
                                         <h1 class="oae-threedots">${group.displayName|encodeForHTML}</h1>
                                         <i class="icon-caret-down"></i>
-                                        <small>__MSG__GROUP__</small>
+                                        <small class="oae-threedots">__MSG__GROUP__</small>
                                     </div>
                                 </div>
                             </button>
@@ -54,58 +55,60 @@ <h1 class="oae-threedots">${group.displayName|encodeForHTML}</h1>
                     </div>
                 --></div>
 
-                <div id="group-join-actions" class="oae-clip-container-right hide">
-                    <div class="oae-clip oae-clip-secondary oae-clip-flipped">
-                        <div class="oae-clip-fold">
-                            <div class="oae-clip-fold-inner"></div>
-                            <div class="oae-clip-fold-outer"></div>
-                        </div>
-                        <div class="oae-clip-content">
-                            <button type="button" class="group-join">
-                                <div>
-                                    <i class="icon-pushpin pull-left"></i>
-                                    <h1>__MSG__JOIN_GROUP__</h1>
-                                </div>
-                            </button>
+                <div class="hidden-xs hidden-sm">
+                    <div id="group-join-actions" class="oae-clip-container-right hide">
+                        <div class="oae-clip oae-clip-secondary oae-clip-flipped">
+                            <div class="oae-clip-fold">
+                                <div class="oae-clip-fold-inner"></div>
+                                <div class="oae-clip-fold-outer"></div>
+                            </div>
+                            <div class="oae-clip-content">
+                                <button type="button" class="group-join">
+                                    <div>
+                                        <i class="icon-pushpin pull-left"></i>
+                                        <h1>__MSG__JOIN_GROUP__</h1>
+                                    </div>
+                                </button>
+                            </div>
                         </div>
                     </div>
-                </div>
 
-                <div id="group-manager-actions" class="oae-clip-container-right hide">
-                    <div class="oae-clip oae-clip-flipped oae-dnd-upload">
-                        <div class="oae-clip-fold">
-                            <div class="oae-clip-fold-inner"></div>
-                            <div class="oae-clip-fold-outer"></div>
-                        </div>
-                        <div class="oae-clip-content">
-                            <button type="button" class="oae-trigger-upload">
-                                <div>
-                                    <i class="icon-cloud-upload pull-left"></i>
-                                    <h1>__MSG__UPLOAD__</h1>
-                                </div>
-                            </button>
+                    <div id="group-manager-actions" class="oae-clip-container-right hide">
+                        <div class="oae-clip oae-clip-flipped oae-dnd-upload">
+                            <div class="oae-clip-fold">
+                                <div class="oae-clip-fold-inner"></div>
+                                <div class="oae-clip-fold-outer"></div>
+                            </div>
+                            <div class="oae-clip-content">
+                                <button type="button" class="oae-trigger-upload">
+                                    <div>
+                                        <i class="icon-cloud-upload pull-left"></i>
+                                        <h1>__MSG__UPLOAD__</h1>
+                                    </div>
+                                </button>
+                            </div>
                         </div>
-                    </div>
 
-                    <div class="oae-clip oae-clip-secondary oae-clip-flipped">
-                        <div class="oae-clip-fold">
-                            <div class="oae-clip-fold-inner"></div>
-                            <div class="oae-clip-fold-outer"></div>
-                        </div>
-                        <div class="oae-clip-content">
-                            <button>
+                        <div class="oae-clip oae-clip-secondary oae-clip-flipped">
+                            <div class="oae-clip-fold">
+                                <div class="oae-clip-fold-inner"></div>
+                                <div class="oae-clip-fold-outer"></div>
+                            </div>
+                            <div class="oae-clip-content">
+                                <button>
+                                    <div>
+                                        <i class="icon-plus-sign pull-left"></i>
+                                        <h1>__MSG__CREATE__</h1>
+                                        <i class="icon-caret-down"></i>
+                                    </div>
+                                </button>
                                 <div>
-                                    <i class="icon-plus-sign pull-left"></i>
-                                    <h1>__MSG__CREATE__</h1>
-                                    <i class="icon-caret-down"></i>
+                                    <ul>
+                                        <li><button class="oae-trigger-createlink"><i class="icon-link"></i>__MSG__LINK__</button></li>
+                                        <li><button class="oae-trigger-createcollabdoc"><i class="icon-edit"></i>__MSG__DOCUMENT__</button></li>
+                                        <li><button class="oae-trigger-creatediscussion"><i class="icon-comments"></i>__MSG__DISCUSSION__</button></li>
+                                    </ul>
                                 </div>
-                            </button>
-                            <div>
-                                <ul>
-                                    <li><button class="oae-trigger-createlink"><i class="icon-link"></i>__MSG__LINK__</button></li>
-                                    <li><button class="oae-trigger-createcollabdoc"><i class="icon-edit"></i>__MSG__DOCUMENT__</button></li>
-                                    <li><button class="oae-trigger-creatediscussion"><i class="icon-comments"></i>__MSG__DISCUSSION__</button></li>
-                                </ul>
                             </div>
                         </div>
                     </div>
@@ -123,9 +126,10 @@ <h1>__MSG__CREATE__</h1>
                     </div>
                 </div>
             </div>
+
             <!-- GROUP CONTENT -->
             <div data-widget="lhnavigation"><!-- --></div>
-        </div>
+        </main>
 
         <!-- FOOTER -->
         <div data-widget="footer"><!-- --></div>
diff --git a/ui/index.html b/ui/index.html
index 242048ea096..eae907915dc 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -1,6 +1,8 @@
 <!DOCTYPE HTML>
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
+
+        <meta name="viewport" content="width=device-width, user-scalable=no">
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
         <noscript>
@@ -20,47 +22,58 @@
         <div data-widget="topnavigation"><!-- --></div>
 
         <!-- BODY -->
-        <div id="index-container" class="oae-branding-container oae-main-content">
+        <main id="index-container" class="oae-branding-container oae-main-content" role="main">
             <div id="index-content">
-                <div class="row-fluid">
-                    <div class="span12 oae-panel-tertiary index-search-container">
-                        <form id="index-search-form" aria-label="__MSG__SEARCH_FOR_CONTENT_PEOPLE_GROUPS__" role="search" class="form-inline">
-                            <label for="index-search-query" class="oae-aural-text">__MSG__SEARCH__</label>
-                            <input type="text" id="index-search-query" class="input-xxlarge pull-left span9" title="__MSG__SEARCH_FOR_CONTENT_PEOPLE_GROUPS__">
-                            <button type="submit" class="btn btn-primary btn-large" title="__MSG__SEARCH__">__MSG__SEARCH__</button>
-                        </form>
-                    </div>
+                <div class="oae-panel-tertiary index-search-container row">
+                    <form id="index-search-form" class="form-horizontal" role="search" aria-label="__MSG__SEARCH_FOR_CONTENT_PEOPLE_GROUPS__">
+                        <div class="form-group">
+                            <input type="text" id="index-search-query" class="form-control search-query form-control pull-left" title="__MSG__SEARCH_FOR_CONTENT_PEOPLE_GROUPS__" placeholder="__MSG__SEARCH_FOR_CONTENT_PEOPLE_GROUPS__"/>
+                            <button type="submit" id="index-search-icon" class="btn btn-link pull-left">
+                                <i class="icon-search"><span class="oae-aural-text">__MSG__SEARCH__</span></i>
+                            </button>
+                        </div>
+                    </form>
                 </div>
-                <div class="row-fluid">
-                    <div id="index-video-container" class="span7 text-center">
-                        <button type="button" id="index-video-launch" class="oae-trigger-productvideo btn btn-link" title="__MSG__PLAY_VIDEO__">
-                            <i class="icon-play-circle active"><span class="oae-aural-text">__MSG__PLAY_VIDEO__</span></i>
-                        </button>
-                    </div>
-                    <div class="span5 oae-panel-primary">
+                <div class="row">
+                    <div id="index-video-container" class="col-md-7 text-center"><!-- --></div>
+                    <div class="col-md-5 oae-panel-primary">
                         <h1 id="index-slogan">__MSG__SUPPORTING_ACADEMIC_COLLABORATION__</h1>
                         <p id="index-slogan-description">__MSG__A_POWERFULL_NEW_WAY_FOR_STUDENTS_AND_FACULTY_TO_CREATE_KNOWLEDGE_COLLABORATE_AND_CONNECT_WITH_THE_WORLD__</p>
                     </div>
                 </div>
-                <div class="row-fluid">
-                    <div class="span4 oae-panel-secondary index-bottom">
+                <div class="row">
+                    <div class="col-md-4 oae-panel-secondary index-bottom">
                         <i class="icon-edit pull-left"></i>
                         <h2 class="index-bottom-slogan">__MSG__AUTHORING_EXPERIENCE__</h2>
                         <p class="index-bottom-description">__MSG__RICH_COMPELLING_INTERACTIVE_CONTENT_AUTHORING__</p>
                     </div>
-                    <div class="span4 oae-panel-secondary index-bottom">
+                    <div class="col-md-4 oae-panel-secondary index-bottom">
                         <i class="icon-comments pull-left"></i>
                         <h2 class="index-bottom-slogan">__MSG__CHANNELS_OF_COMMUNICATION__</h2>
                         <p class="index-bottom-description">__MSG__PARTICIPATING_IN_DISCUSSIONS_AND_FEEDBACK_WITHIN_PERSONALIZED_NETWORKS__</p>
                     </div>
-                    <div class="span4 oae-panel-secondary index-bottom">
+                    <div class="col-md-4 oae-panel-secondary index-bottom">
                         <i class="icon-cloud-download pull-left"></i>
                         <h2 class="index-bottom-slogan">__MSG__ACCESS_TO_CONTENT__</h2>
                         <p class="index-bottom-description">__MSG__EXPANDED_ACCESS_TO_LEARNING_AND_RESEARCH_MATERIALS_BETTER_CONNECTS_LIBRARY_SERVICES__</p>
                     </div>
                 </div>
             </div>
-        </div>
+        </main>
+
+        <div id="index-productvideo-template"><!--
+            {if !oae.api.util.isHandheldDevice()}
+                <div id="index-video">
+                    <button type="button" id="index-video-launch" class="oae-trigger-productvideo btn btn-link" title="__MSG__PLAY_VIDEO__">
+                        <i class="icon-play-circle active"><span class="oae-aural-text">__MSG__PLAY_VIDEO__</span></i>
+                    </button>
+                </div>
+            {else}
+                <div id="index-video" class="index-video-mobile">
+                    <iframe width="100%" height="100%" src="//www.youtube.com/embed/cfiM87Y0pWw?rel=0&autoplay=1&enablejsapi=1&controls=0&showinfo=0&modestbranding=1" frameborder="0" allowfullscreen></iframe>
+                </div>
+            {/if}
+        --></div>
 
         <!-- FOOTER -->
         <div data-widget="footer"><!-- --></div>
diff --git a/ui/js/content.js b/ui/js/content.js
index e907bbe4454..b86664a5905 100644
--- a/ui/js/content.js
+++ b/ui/js/content.js
@@ -21,6 +21,65 @@ require(['jquery', 'underscore', 'oae.core'], function($, _, oae) {
 
     // Variable used to cache the requested content profile
     var contentProfile = null;
+    // Variable used to cache the content's base URL
+    var baseUrl = '/content/' + $.url().segment(2) + '/' + $.url().segment(3);
+
+    /**
+     * Set up the left hand navigation with the content space page structure.
+     * The content left hand navigation item will not be shown to the user and is only here to load the correct contentprofile widget.
+     */
+    var setUpNavigation = function() {
+        var lhNavActions = [];
+        // If the user is logged in, the comment and share functionality should be added
+        if (!oae.data.me.anon) {
+            lhNavActions.push({
+                'icon': 'icon-comments',
+                'title': oae.api.i18n.translate('__MSG__COMMENT__'),
+                'class': 'comments-focus-new-comment'
+            },
+            {
+                'icon': 'icon-share',
+                'title': oae.api.i18n.translate('__MSG__SHARE__'),
+                'class': 'oae-trigger-share',
+                'data': {
+                    'data-id': contentProfile.id,
+                    'data-resourcetype': contentProfile.resourceType,
+                    'data-resourcesubtype': contentProfile.resourceSubType
+                }
+            });
+        }
+
+        var lhNavPages = [{
+            'id': 'content',
+            'title': oae.api.i18n.translate('__MSG__CONTENT__'),
+            'icon': 'icon-comments',
+            'class': 'hide',
+            'layout': [
+                {
+                    'width': 'col-md-12',
+                    'widgets': [
+                        {
+                            'id': getPreviewWidgetId(),
+                            'settings': contentProfile
+                        }
+                    ]
+                },
+                {
+                    'width': 'col-md-12',
+                    'widgets': [
+                        {
+                            'id': 'comments'
+                        }
+                    ]
+                }
+            ]
+        }];
+
+        $(window).trigger('oae.trigger.lhnavigation', [lhNavPages, lhNavActions, baseUrl]);
+        $(window).on('oae.ready.lhnavigation', function() {
+            $(window).trigger('oae.trigger.lhnavigation', [lhNavPages, lhNavActions, baseUrl]);
+        });
+    };
 
 
     ////////////////////////////////////
@@ -49,8 +108,8 @@ require(['jquery', 'underscore', 'oae.core'], function($, _, oae) {
             oae.api.util.setBrowserTitle(contentProfile.displayName);
             // Render the entity information and actions
             setUpClips();
-            // Show the content preview
-            setUpContentPreview();
+            // Set up the page
+            setUpNavigation();
             // Set up the context event exchange
             setUpContext();
             // We can now unhide the page
@@ -73,23 +132,23 @@ require(['jquery', 'underscore', 'oae.core'], function($, _, oae) {
     };
 
     /**
-     * Renders the content preview.
+     * Get the name of the preview widget to use for the current piece of content
+     *
+     * @return {String}    The name of the widget to use to preview the content
      */
-    var setUpContentPreview = function() {
-        // Remove the old preview widget
-        $('#content-preview-container').html('');
-        // Based on the content type, insert a new preview widget and pass in the updated content profile data
+    var getPreviewWidgetId = function() {
+        // Based on the content type, return a content preview widget name
         if (contentProfile.resourceSubType === 'file') {
             // Load document viewer when a PDF or Office document needs to be displayed
             if (contentProfile.previews && contentProfile.previews.pageCount) {
-                oae.api.widget.insertWidget('documentpreview', null, $('#content-preview-container'), null, contentProfile);
+                return 'documentpreview';
             } else {
-                oae.api.widget.insertWidget('filepreview', null, $('#content-preview-container'), null, contentProfile);
+                return 'filepreview';
             }
         } else if (contentProfile.resourceSubType === 'link') {
-            oae.api.widget.insertWidget('linkpreview', null, $('#content-preview-container'), null, contentProfile);
+            return 'linkpreview';
         } else if (contentProfile.resourceSubType === 'collabdoc') {
-            oae.api.widget.insertWidget('etherpad', null, $('#content-preview-container'), null, contentProfile);
+            return 'etherpad';
         }
     };
 
@@ -138,6 +197,19 @@ require(['jquery', 'underscore', 'oae.core'], function($, _, oae) {
         });
     };
 
+    /**
+     * Empty the content preview container and insert the updated content preview widget
+     */
+    var refreshContentPreview = function() {
+        var $widgetContainer = $('.oae-page > .row .oae-lhnavigation-toggle + div');
+
+        // Empty the preview container
+        $widgetContainer.empty();
+
+        // Insert the new updated content preview widget
+        oae.api.widget.insertWidget(getPreviewWidgetId(), null, $widgetContainer, null, contentProfile);
+    };
+
 
     ////////////////////////
     // UPLOAD NEW VERSION //
@@ -152,10 +224,9 @@ require(['jquery', 'underscore', 'oae.core'], function($, _, oae) {
     var refreshContentProfile = function(ev, updatedContent) {
         // Cache the content profile data
         contentProfile = updatedContent;
-        // Re-render the entity information
+        // Refresh the content profile elements
+        refreshContentPreview();
         setUpClips();
-        // Show the content preview
-        setUpContentPreview();
     };
 
     // Catches an event sent out when the content has been updated. This can be either when
@@ -258,9 +329,8 @@ require(['jquery', 'underscore', 'oae.core'], function($, _, oae) {
 
     $(document).on('oae.revisions.done', function(ev, restoredRevision, updatedContentProfile) {
         contentProfile = updatedContentProfile;
-        // Refresh the preview and clip
-        setUpContentPreview();
-        setUpClips();
+        // Refresh the content profile elements
+        refreshContentProfile(ev, updatedContentProfile);
     });
 
 
diff --git a/ui/js/discussion.js b/ui/js/discussion.js
index 924412c27ba..6e25bed1609 100644
--- a/ui/js/discussion.js
+++ b/ui/js/discussion.js
@@ -21,6 +21,65 @@ require(['jquery','oae.core'], function($, oae) {
 
     // Variable used to cache the requested discussion profile
     var discussionProfile = null;
+    // Variable used to cache the discussion's base URL
+    var baseUrl = '/discussion/' + $.url().segment(2) + '/' + $.url().segment(3);
+
+    /**
+     * Set up the left hand navigation with the discussion space page structure.
+     * The discussion left hand navigation item will not be shown to the user and is only here to load the correct discussion profile.
+     */
+    var setUpNavigation = function() {
+        var lhNavActions = [];
+        // If the user is logged in, the comment and share functionality should be added
+        if (!oae.data.me.anon) {
+            lhNavActions.push({
+                'icon': 'icon-comments',
+                'title': oae.api.i18n.translate('__MSG__COMMENT__'),
+                'class': 'comments-focus-new-comment'
+            },
+            {
+                'icon': 'icon-share',
+                'title': oae.api.i18n.translate('__MSG__SHARE__'),
+                'class': 'oae-trigger-share',
+                'data': {
+                    'data-id': discussionProfile.id,
+                    'data-resourcetype': discussionProfile.resourceType,
+                    'data-resourcesubtype': discussionProfile.resourceSubType
+                }
+            });
+        }
+
+        var lhNavPages = [{
+            'id': 'discussion',
+            'title': oae.api.i18n.translate('__MSG__DISCUSSION__'),
+            'icon': 'icon-comments',
+            'class': 'hide',
+            'layout': [
+                {
+                    'width': 'col-md-12',
+                    'widgets': [
+                        {
+                            'id': 'discussion',
+                            'settings': discussionProfile
+                        }
+                    ]
+                },
+                {
+                    'width': 'col-md-12',
+                    'widgets': [
+                        {
+                            'id': 'comments'
+                        }
+                    ]
+                }
+            ]
+        }];
+
+        $(window).trigger('oae.trigger.lhnavigation', [lhNavPages, lhNavActions, baseUrl]);
+        $(window).on('oae.ready.lhnavigation', function() {
+            $(window).trigger('oae.trigger.lhnavigation', [lhNavPages, lhNavActions, baseUrl]);
+        });
+    };
 
 
     ///////////////////////////////////////
@@ -49,8 +108,8 @@ require(['jquery','oae.core'], function($, oae) {
             oae.api.util.setBrowserTitle(discussionProfile.displayName);
             // Render the entity information
             setUpClips();
-            // Render the discussion topic
-            setUpTopic();
+            // Set up the page
+            setUpNavigation();
             // Set up the context event exchange
             setUpContext();
             // We can now unhide the page
@@ -91,17 +150,6 @@ require(['jquery','oae.core'], function($, oae) {
         }
     };
 
-    /**
-     * Render the discussions's topic, if available
-     */
-    var setUpTopic = function() {
-        if (discussionProfile.description) {
-            var topic = oae.api.util.security().encodeForHTMLWithLinks(discussionProfile.description).replace(/\n/g, '<br/>');
-            $('#discussion-topic').html(topic);
-            $('#discussion-topic-container').show();
-        }
-    };
-
     /**
      * Subscribe to discussion activity push notifications, allowing for updating the discussion profile when changes to the discussion
      * are made by a different user after the initial page load
@@ -182,12 +230,11 @@ require(['jquery','oae.core'], function($, oae) {
     /////////////////////
 
     /**
-     * Re-render the discussion's clip and topic when the title or topic have been updated.
+     * Re-render the discussion's clip. The discussion topic will be handled by the discussion widget.
      */
     $(document).on('oae.editdiscussion.done', function(ev, data) {
         discussionProfile = data;
         setUpClips();
-        setUpTopic();
     });
 
 
diff --git a/ui/js/group.js b/ui/js/group.js
index 728c02198a0..80031f6868d 100644
--- a/ui/js/group.js
+++ b/ui/js/group.js
@@ -103,17 +103,59 @@ require(['jquery', 'oae.core'], function($, oae) {
      * Set up the left hand navigation with the group space page structure
      */
     var setUpNavigation = function() {
-        // Structure that will be used to construct the left hand navigation
-        var lhNavigation = [];
+        // Structure that will be used to construct the left hand navigation actions
+        var lhNavActions = [];
+
+        // Add the upload and create clips for managers
+        if (groupProfile.isManager) {
+            lhNavActions.push({
+                'icon': 'icon-cloud-upload',
+                'title': oae.api.i18n.translate('__MSG__UPLOAD__'),
+                'class': 'oae-trigger-upload'
+            },
+            {
+                'icon': 'icon-plus-sign',
+                'title': oae.api.i18n.translate('__MSG__CREATE__'),
+                'children': [
+                    {
+                        'icon': 'icon-link',
+                        'title': oae.api.i18n.translate('__MSG__LINK__'),
+                        'class': 'oae-trigger-createlink'
+                    },
+                    {
+                        'icon': 'icon-edit',
+                        'title': oae.api.i18n.translate('__MSG__DOCUMENT__'),
+                        'class': 'oae-trigger-createcollabdoc'
+                    },
+                    {
+                        'icon': 'icon-comments',
+                        'title': oae.api.i18n.translate('__MSG__DISCUSSION__'),
+                        'class': 'oae-trigger-creatediscussion'
+                    }
+                ]
+            });
+        }
+
+        // Add the join clip when not a member and user can join
+        if (!groupProfile.isMember && groupProfile.canJoin) {
+            lhNavActions.push({
+                'icon': 'icon-pushpin',
+                'title': oae.api.i18n.translate('__MSG__JOIN_GROUP__'),
+                'class': 'group-join'
+            });
+        }
+
+        // Structure that will be used to construct the left hand navigation pages
+        var lhNavPages = [];
         // Only show the recent activity to group members
         if (groupProfile.isMember) {
-            lhNavigation.push({
+            lhNavPages.push({
                 'id': 'activity',
                 'title': oae.api.i18n.translate('__MSG__RECENT_ACTIVITY__'),
                 'icon': 'icon-dashboard',
                 'layout': [
                     {
-                        'width': 'span12',
+                        'width': 'col-md-12',
                         'widgets': [
                             {
                                 'id': 'activity',
@@ -127,69 +169,70 @@ require(['jquery', 'oae.core'], function($, oae) {
                 ]
             });
         }
-        lhNavigation.push(
-            {
-                'id': 'library',
-                'title': oae.api.i18n.translate('__MSG__LIBRARY__'),
-                'icon': 'icon-briefcase',
-                'layout': [
-                    {
-                        'width': 'span12',
-                        'widgets': [
-                            {
-                                'id': 'contentlibrary',
-                                'settings': {
-                                    'context': groupProfile,
-                                    'canManage': groupProfile.isManager
-                                }
+
+        lhNavPages.push({
+            'id': 'library',
+            'title': oae.api.i18n.translate('__MSG__LIBRARY__'),
+            'icon': 'icon-briefcase',
+            'layout': [
+                {
+                    'width': 'col-md-12',
+                    'widgets': [
+                        {
+                            'id': 'contentlibrary',
+                            'settings': {
+                                'context': groupProfile,
+                                'canManage': groupProfile.isManager
                             }
-                        ]
-                    }
-                ]
-            },
-            {
-                'id': 'discussions',
-                'title': oae.api.i18n.translate('__MSG__DISCUSSIONS__'),
-                'icon': 'icon-comments',
-                'layout': [
-                    {
-                        'width': 'span12',
-                        'widgets': [
-                            {
-                                'id': 'discussionslibrary',
-                                'settings': {
-                                    'context': groupProfile,
-                                    'canManage': groupProfile.isManager
-                                }
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            'id': 'discussions',
+            'title': oae.api.i18n.translate('__MSG__DISCUSSIONS__'),
+            'icon': 'icon-comments',
+            'layout': [
+                {
+                    'width': 'col-md-12',
+                    'widgets': [
+                        {
+                            'id': 'discussionslibrary',
+                            'settings': {
+                                'context': groupProfile,
+                                'canManage': groupProfile.isManager
                             }
-                        ]
-                    }
-                ]
-            },
-            {
-                'id': 'members',
-                'title': oae.api.i18n.translate('__MSG__MEMBERS__'),
-                'icon': 'icon-user',
-                'layout': [
-                    {
-                        'width': 'span12',
-                        'widgets': [
-                            {
-                                'id': 'members',
-                                'settings': {
-                                    'context': groupProfile,
-                                    'canManage': groupProfile.isManager
-                                }
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            'id': 'members',
+            'title': oae.api.i18n.translate('__MSG__MEMBERS__'),
+            'icon': 'icon-user',
+            'layout': [
+                {
+                    'width': 'col-md-12',
+                    'widgets': [
+                        {
+                            'id': 'members',
+                            'settings': {
+                                'context': groupProfile,
+                                'canManage': groupProfile.isManager
                             }
-                        ]
-                    }
-                ]
-            }
-        );
+                        }
+                    ]
+                }
+            ]
+        });
 
-        $(window).trigger('oae.trigger.lhnavigation', [lhNavigation, baseUrl]);
+        $(window).trigger('oae.trigger.lhnavigation', [lhNavPages, lhNavActions, baseUrl]);
+        $('.oae-page').addClass('oae-anon-toggle');
         $(window).on('oae.ready.lhnavigation', function() {
-            $(window).trigger('oae.trigger.lhnavigation', [lhNavigation, baseUrl]);
+            $(window).trigger('oae.trigger.lhnavigation', [lhNavPages, lhNavActions, baseUrl]);
+            $('.oae-page').addClass('oae-anon-toggle');
         });
     };
 
@@ -233,7 +276,7 @@ require(['jquery', 'oae.core'], function($, oae) {
                 'accessUpdatedBody': oae.api.i18n.translate('__MSG__GROUP_ACCESS_SUCCESSFULLY_UPDATED__'),
                 'accessUpdatedTitle': oae.api.i18n.translate('__MSG__GROUP_ACCESS_UPDATED__'),
                 'membersTitle': oae.api.i18n.translate('__MSG__GROUP_MEMBERS__'),
-                'private': oae.api.i18n.translate('__MSG__PARTICIPANTS_ONLY__'),
+                'private': oae.api.i18n.translate('__MSG__MEMBERS_ONLY__'),
                 'loggedin': oae.api.util.security().encodeForHTML(groupProfile.tenant.displayName),
                 'public': oae.api.i18n.translate('__MSG__PUBLIC__'),
                 'privateDescription': oae.api.i18n.translate('__MSG__GROUP_PRIVATE_DESCRIPTION_PRESENT__'),
@@ -294,7 +337,7 @@ require(['jquery', 'oae.core'], function($, oae) {
      * Join the current group.
      * If successful, a notification will be displayed and the page will be reloaded after 2 seconds.
      */
-    $('.group-join').on('click', function() {
+    var joinGroup = function() {
         // Disable the join buttons
         $('.group-join').prop('disabled', true);
 
@@ -323,7 +366,10 @@ require(['jquery', 'oae.core'], function($, oae) {
                 $('.group-join').prop('disabled', false);
             }
         });
-    });
+    };
+
+    // Bind to the click on the join clip
+    $(document).on('click', '.group-join', joinGroup);
 
 
     ////////////////
diff --git a/ui/js/index.js b/ui/js/index.js
index c047abce41d..6bd41781150 100644
--- a/ui/js/index.js
+++ b/ui/js/index.js
@@ -30,6 +30,14 @@ require(['jquery','oae.core'], function($, oae) {
         });
     };
 
+    /**
+     * Set up the product video button when on desktop, render the video in the page for mobile
+     */
+    var setUpProductVideo = function() {
+        oae.api.util.template().render($('#index-productvideo-template'), null, $('#index-video-container'));
+    };
+
     setUpSearch();
+    setUpProductVideo();
 
 });
diff --git a/ui/js/me.js b/ui/js/me.js
index 260c17c4358..8ee8ccffa90 100644
--- a/ui/js/me.js
+++ b/ui/js/me.js
@@ -26,15 +26,48 @@ require(['jquery','oae.core'], function($, oae) {
     // Set the browser title
     oae.api.util.setBrowserTitle(oae.data.me.displayName);
 
-    // Structure that will be used to construct the left hand navigation
-    var lhNavigation = [
+    // Structure that will be used to construct the left hand navigation actions
+    var lhNavActions = [{
+        'icon': 'icon-cloud-upload',
+        'title': oae.api.i18n.translate('__MSG__UPLOAD__'),
+        'class': 'oae-trigger-upload'
+    },
+    {
+        'icon': 'icon-plus-sign',
+        'title': oae.api.i18n.translate('__MSG__CREATE__'),
+        'children': [
+            {
+                'icon': 'icon-group',
+                'title': oae.api.i18n.translate('__MSG__GROUP__'),
+                'class': 'oae-trigger-creategroup'
+            },
+            {
+                'icon': 'icon-link',
+                'title': oae.api.i18n.translate('__MSG__LINK__'),
+                'class': 'oae-trigger-createlink'
+            },
+            {
+                'icon': 'icon-edit',
+                'title': oae.api.i18n.translate('__MSG__DOCUMENT__'),
+                'class': 'oae-trigger-createcollabdoc'
+            },
+            {
+                'icon': 'icon-comments',
+                'title': oae.api.i18n.translate('__MSG__DISCUSSION__'),
+                'class': 'oae-trigger-creatediscussion'
+            }
+        ]
+    }];
+
+    // Structure that will be used to construct the left hand navigation pages
+    var lhNavPages = [
         {
             'id': 'dashboard',
             'title': oae.api.i18n.translate('__MSG__RECENT_ACTIVITY__'),
             'icon': 'icon-dashboard',
             'layout': [
                 {
-                    'width': 'span12',
+                    'width': 'col-md-12',
                     'widgets': [
                         {
                             'id': 'activity',
@@ -53,7 +86,7 @@ require(['jquery','oae.core'], function($, oae) {
             'icon': 'icon-briefcase',
             'layout': [
                 {
-                    'width': 'span12',
+                    'width': 'col-md-12',
                     'widgets': [
                         {
                             'id': 'contentlibrary',
@@ -72,7 +105,7 @@ require(['jquery','oae.core'], function($, oae) {
             'icon': 'icon-comments',
             'layout': [
                 {
-                    'width': 'span12',
+                    'width': 'col-md-12',
                     'widgets': [
                         {
                             'id': 'discussionslibrary',
@@ -91,7 +124,7 @@ require(['jquery','oae.core'], function($, oae) {
             'icon': 'icon-group',
             'layout': [
                 {
-                    'width': 'span12',
+                    'width': 'col-md-12',
                     'widgets': [
                         {
                             'id': 'memberships',
@@ -110,7 +143,7 @@ require(['jquery','oae.core'], function($, oae) {
             'icon': 'icon-random',
             'layout': [
                 {
-                    'width': 'span12',
+                    'width': 'col-md-12',
                     'widgets': [
                         {
                             'id': 'network',
@@ -129,9 +162,9 @@ require(['jquery','oae.core'], function($, oae) {
      * Set up the left hand navigation with the me space page structure
      */
     var setUpNavigation = function() {
-        $(window).trigger('oae.trigger.lhnavigation', [lhNavigation, baseUrl]);
+        $(window).trigger('oae.trigger.lhnavigation', [lhNavPages, lhNavActions, baseUrl]);
         $(window).on('oae.ready.lhnavigation', function() {
-            $(window).trigger('oae.trigger.lhnavigation', [lhNavigation, baseUrl]);
+            $(window).trigger('oae.trigger.lhnavigation', [lhNavPages, lhNavActions, baseUrl]);
         });
     };
 
diff --git a/ui/js/user.js b/ui/js/user.js
index 84fc0bc5fb1..7297c7528b8 100644
--- a/ui/js/user.js
+++ b/ui/js/user.js
@@ -86,84 +86,98 @@ require(['jquery', 'oae.core'], function($, oae) {
      * Set up the left hand navigation with the user space page structure
      */
     var setUpNavigation = function() {
-        // Structure that will be used to construct the left hand navigation
-        var lhNavigation = [
-            {
-                'id': 'library',
-                'title': oae.api.i18n.translate('__MSG__LIBRARY__'),
-                'icon': 'icon-briefcase',
-                'layout': [
-                    {
-                        'width': 'span12',
-                        'widgets': [
-                            {
-                                'id': 'contentlibrary',
-                                'settings': {
-                                    'context': userProfile
-                                }
+        // Structure that will be used to construct the left hand navigation actions
+        var lhNavActions = [];
+        // Add the follow button if the user can be followed
+        if (userProfile.following && userProfile.following.canFollow) {
+            lhNavActions.push({
+                'icon': 'icon-bookmark',
+                'title': oae.api.i18n.translate('__MSG__FOLLOW__'),
+                'class': 'user-follow'
+            });
+        }
+
+        // Structure that will be used to construct the left hand navigation pages
+        lhNavPages = [];
+        // Add the rest of the navigation
+        lhNavPages.push({
+            'id': 'library',
+            'title': oae.api.i18n.translate('__MSG__LIBRARY__'),
+            'icon': 'icon-briefcase',
+            'layout': [
+                {
+                    'width': 'col-md-12',
+                    'widgets': [
+                        {
+                            'id': 'contentlibrary',
+                            'settings': {
+                                'context': userProfile
                             }
-                        ]
-                    }
-                ]
-            },
-            {
-                'id': 'discussions',
-                'title': oae.api.i18n.translate('__MSG__DISCUSSIONS__'),
-                'icon': 'icon-comments',
-                'layout': [
-                    {
-                        'width': 'span12',
-                        'widgets': [
-                            {
-                                'id': 'discussionslibrary',
-                                'settings': {
-                                    'context': userProfile
-                                }
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            'id': 'discussions',
+            'title': oae.api.i18n.translate('__MSG__DISCUSSIONS__'),
+            'icon': 'icon-comments',
+            'layout': [
+                {
+                    'width': 'col-md-12',
+                    'widgets': [
+                        {
+                            'id': 'discussionslibrary',
+                            'settings': {
+                                'context': userProfile
                             }
-                        ]
-                    }
-                ]
-            },
-            {
-                'id': 'groups',
-                'title': oae.api.i18n.translate('__MSG__GROUPS__'),
-                'icon': 'icon-group',
-                'layout': [
-                    {
-                        'width': 'span12',
-                        'widgets': [
-                            {
-                                'id': 'memberships',
-                                'settings': {
-                                    'context': userProfile
-                                }
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            'id': 'groups',
+            'title': oae.api.i18n.translate('__MSG__GROUPS__'),
+            'icon': 'icon-group',
+            'layout': [
+                {
+                    'width': 'col-md-12',
+                    'widgets': [
+                        {
+                            'id': 'memberships',
+                            'settings': {
+                                'context': userProfile
                             }
-                        ]
-                    }
-                ]
-            },
-            {
-                'id': 'network',
-                'title': oae.api.i18n.translate('__MSG__NETWORK__'),
-                'icon': 'icon-random',
-                'layout': [
-                    {
-                        'width': 'span12',
-                        'widgets': [
-                            {
-                                'id': 'network',
-                                'settings': {
-                                    'context': userProfile
-                                }
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            'id': 'network',
+            'title': oae.api.i18n.translate('__MSG__NETWORK__'),
+            'icon': 'icon-random',
+            'layout': [
+                {
+                    'width': 'span12',
+                    'widgets': [
+                        {
+                            'id': 'network',
+                            'settings': {
+                                'context': userProfile
                             }
-                        ]
-                    }
-                ]
-            }
-        ];
-        $(window).trigger('oae.trigger.lhnavigation', [lhNavigation, baseUrl]);
+                        }
+                    ]
+                }
+            ]
+        });
+
+        $(window).trigger('oae.trigger.lhnavigation', [lhNavPages, lhNavActions, baseUrl]);
+        $('.oae-page').addClass('oae-anon-toggle');
         $(window).on('oae.ready.lhnavigation', function() {
-            $(window).trigger('oae.trigger.lhnavigation', [lhNavigation, baseUrl]);
+            $(window).trigger('oae.trigger.lhnavigation', [lhNavPages, lhNavActions, baseUrl]);
+            $('.oae-page').addClass('oae-anon-toggle');
         });
     };
 
@@ -173,9 +187,9 @@ require(['jquery', 'oae.core'], function($, oae) {
     /////////////////
 
     /**
-     * Follow the user when the `follow` button is clicked
+     * Follow a user
      */
-    $(document).on('click', '#user-follow', function() {
+    var followUser = function() {
         oae.api.follow.follow(userProfile.id, function(err) {
             if (!err) {
                 // Show a success notification
@@ -185,7 +199,8 @@ require(['jquery', 'oae.core'], function($, oae) {
                         'displayName': userProfile.displayName
                     })
                 );
-                $('#user-follow-actions').hide();
+                $('#user-follow-actions').detach();
+                $('li.user-follow').detach();
             } else {
                 // Show an error notification
                 oae.api.util.notification(
@@ -197,7 +212,10 @@ require(['jquery', 'oae.core'], function($, oae) {
                 );
             }
         });
-    });
+    };
+
+    // Follow the user when the `follow` button is clicked
+    $(document).on('click', '.user-follow', followUser);
 
     getUserProfile();
 
diff --git a/ui/me.html b/ui/me.html
index d378fb80798..eb03328f526 100644
--- a/ui/me.html
+++ b/ui/me.html
@@ -2,6 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
 
+        <meta name="viewport" content="width=device-width, user-scalable=no">
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
         <noscript>
@@ -19,7 +20,7 @@
         <div data-widget="topnavigation"><!-- --></div>
 
         <!-- BODY -->
-        <div class="oae-main-content">
+        <main class="oae-main-content" role="main">
 
             <!-- CLIPS -->
             <div class="oae-clip-container">
@@ -37,7 +38,7 @@
                                     <div>
                                         <h1 class="oae-threedots">${oae.data.me.displayName|encodeForHTML}</h1>
                                         <i class="icon-caret-down"></i>
-                                        <small>${oae.data.me.tenant.displayName|encodeForHTML}</small>
+                                        <small class="oae-threedots">${oae.data.me.tenant.displayName|encodeForHTML}</small>
                                     </div>
                                 </div>
                             </button>
@@ -52,7 +53,7 @@ <h1 class="oae-threedots">${oae.data.me.displayName|encodeForHTML}</h1>
                     </div>
                 --></div>
 
-                <div class="oae-clip-container-right">
+                <div class="hidden-xs hidden-sm oae-clip-container-right">
                     <div class="oae-clip oae-clip-flipped oae-dnd-upload">
                         <div class="oae-clip-fold">
                             <div class="oae-clip-fold-inner"></div>
@@ -96,7 +97,7 @@ <h1>__MSG__CREATE__</h1>
 
             <!-- CONTENT -->
             <div data-widget="lhnavigation"><!-- --></div>
-        </div>
+        </main>
 
         <!-- FOOTER -->
         <div data-widget="footer"><!-- --></div>
diff --git a/ui/search.html b/ui/search.html
index 62b94fa360f..5358bb2533f 100644
--- a/ui/search.html
+++ b/ui/search.html
@@ -2,6 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
 
+        <meta name="viewport" content="width=device-width, user-scalable=no">
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
         <noscript>
@@ -22,21 +23,24 @@
         <div data-widget="topnavigation"><!-- --></div>
 
         <!-- BODY -->
-        <div class="oae-main-content">
+        <main class="oae-main-content" role="main">
 
             <!-- CLIPS -->
-            <div>
+            <div class="oae-clip-container">
                 <div id="search-clip-container">
-                    <div class="oae-clip">
+                    <div class="col-xs-11 col-sm-7 col-md-6 col-lg-5 oae-clip">
                         <div class="oae-clip-fold">
                             <div class="oae-clip-fold-inner"></div>
                             <div class="oae-clip-fold-outer"></div>
                         </div>
-                        <div class="oae-clip-content">
-                            <form id="search-form" class="form-search">
-                                <label for="search-query" class="oae-aural-text">__MSG__SEARCH__</label>
-                                <input type="text" id="search-query" class="input-xxlarge search-query" title="__MSG__SEARCH_FOR_CONTENT_PEOPLE_GROUPS__" />
-                                <button type="submit" class="btn">__MSG__SEARCH__</button>
+                        <div class="clearfix oae-clip-content">
+                            <form id="search-form" class="form-search form-horizontal" role="search" aria-label="__MSG__SEARCH__">
+                                <div class="form-group">
+                                    <input type="text" id="search-query" class="form-control search-query form-control pull-left" title="__MSG__SEARCH_FOR_CONTENT_PEOPLE_GROUPS__" />
+                                    <button type="submit" id="search-search-icon" class="btn btn-link pull-left" title="__MSG__SEARCH_FOR_CONTENT_PEOPLE_GROUPS__">
+                                        <i class="icon-search"><span class="oae-aural-text">__MSG__SEARCH__</span></i>
+                                    </button>
+                                </div>
                             </form>
                         </div>
                     </div>
@@ -44,68 +48,79 @@
             </div>
 
             <!-- CONTENT -->
-            <div id="search-content-container" class="row-fluid">
-                <div class="span2">
-                    <ul id="search-refine-type" class="nav nav-list">
+            <div id="search-content-container" class="row">
+                <div class="oae-lhnavigation">
+                    <ul id="search-refine-type" class="nav nav-list hidden-xs hidden-sm">
                         <li class="nav-header">__MSG__REFINE_SEARCH_BY_TYPE_COLON__</li>
                         <li>
-                            <label class="checkbox"><input type="checkbox" data-type="user" /> __MSG__PEOPLE__</label>
+                            <label class="checkbox"><input type="checkbox" data-type="user" /><div>__MSG__PEOPLE__</div></label>
                         </li>
                         <li>
-                            <label class="checkbox"><input type="checkbox" data-type="group" /> __MSG__GROUPS__</label>
+                            <label class="checkbox"><input type="checkbox" data-type="group" /><div>__MSG__GROUPS__</div></label>
                         </li>
                         <li>
-                            <label class="checkbox"><input type="checkbox" data-type="content" /> __MSG__CONTENT__</label>
+                            <label class="checkbox"><input type="checkbox" data-type="content" /><div>__MSG__CONTENT__</div></label>
                         </li>
                         <li>
-                            <label class="checkbox"><input type="checkbox" data-type="discussion" /> __MSG__DISCUSSIONS__</label>
+                            <label class="checkbox"><input type="checkbox" data-type="discussion" /><div>__MSG__DISCUSSIONS__</div></label>
                         </li>
                     </ul>
                 </div>
-                <div id="search-list-container" class="span10 oae-list-container">
-                    <div class="oae-list-options">
-                        <div>
-                            <button class="btn oae-list-options-toggle">
-                                <h2>__MSG__SEARCH_RESULTS__ <span id="search-total-results" class="badge"></span></h2>
-                            </button>
-                            <div class="btn-group pull-right">
-                                <button class="btn" data-type="oae-list-compact">
-                                    <i class="icon-list"></i>
-                                    <span class="oae-aural-text">__MSG__LIST_VIEW__</span>
-                                </button>
-                                <button class="btn" data-type="oae-list-details">
-                                    <i class="icon-th-list"></i>
-                                    <span class="oae-aural-text">__MSG__EXPANDED_LIST_VIEW__</span>
-                                </button>
-                                <button class="btn active" data-type="oae-list-grid">
-                                    <i class="icon-th-large"></i>
-                                    <span class="oae-aural-text">__MSG__GRID_VIEW__</span>
-                                </button>
+                <div class="col-xs-12 col-sm-12 col-md-12 oae-page">
+                    <div class="row oae-list-container">
+                        <button type="button" class="btn btn-link hidden-md hidden-lg oae-lhnavigation-toggle">
+                            <i class="icon-align-justify"></i>
+                            <span class="oae-aural-text">__MSG__TOGGLE_NAVIGATION__</span>
+                        </button>
+                        <div class="col-md-12">
+                            <div class="oae-list-options">
+                                <div class="row">
+                                    <button class="btn col-xs-6 oae-list-options-toggle">
+                                        <h2 class="pull-left">__MSG__SEARCH_RESULTS__ <span id="search-total-results" class="badge"></span></h2>
+                                    </button>
+                                    <div class="oae-list-options-actions">
+                                        <div class="col-xs-6">
+                                            <div class="btn-group pull-right">
+                                                <button class="btn" data-type="oae-list-compact">
+                                                    <i class="icon-list"></i>
+                                                    <span class="oae-aural-text">__MSG__LIST_VIEW__</span>
+                                                </button>
+                                                <button class="btn" data-type="oae-list-details">
+                                                    <i class="icon-th-list"></i>
+                                                    <span class="oae-aural-text">__MSG__EXPANDED_LIST_VIEW__</span>
+                                                </button>
+                                                <button class="btn active" data-type="oae-list-grid">
+                                                    <i class="icon-th-large"></i>
+                                                    <span class="oae-aural-text">__MSG__GRID_VIEW__</span>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
                             </div>
+                            <ul class="oae-list oae-list-grid"><!-- --></ul>
                         </div>
-                    </div>
-                    <ul class="oae-list oae-list-grid"><!-- --></ul>
-
-                    <div id="search-noresults-template"><!--
-                        <div class="alert alert-info">
-                            {if query}
-                                {var query = oae.api.util.security().encodeForHTML(query)}
-                                __MSG__SEARCH_QUERY_EMPTY__
-                            {else}
-                                __MSG__SEARCH_EMPTY__
-                            {/if}
-                        </div>
-                    --></div>
 
-                    <div id="search-template"><!--
-                        {for result in results}
-                            ${listItem(result, null, false)}
-                        {/for}
-                    --></div>
+                        <div id="search-noresults-template"><!--
+                            <div class="alert alert-info">
+                                {if query}
+                                    {var query = oae.api.util.security().encodeForHTML(query)}
+                                    __MSG__SEARCH_QUERY_EMPTY__
+                                {else}
+                                    __MSG__SEARCH_EMPTY__
+                                {/if}
+                            </div>
+                        --></div>
 
+                        <div id="search-template"><!--
+                            {for result in results}
+                                ${listItem(result, null, false)}
+                            {/for}
+                        --></div>
+                    </div>
                 </div>
             </div>
-        </div>
+        </main>
 
         <!-- FOOTER -->
         <div data-widget="footer"><!-- --></div>
diff --git a/ui/user.html b/ui/user.html
index c25d327aff3..c86cba087ab 100644
--- a/ui/user.html
+++ b/ui/user.html
@@ -2,6 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
 
+        <meta name="viewport" content="width=device-width, user-scalable=no">
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
         <noscript>
@@ -19,7 +20,7 @@
         <div data-widget="topnavigation"><!-- --></div>
 
         <!-- BODY -->
-        <div class="oae-main-content">
+        <main class="oae-main-content" role="main">
 
             <!-- CLIP -->
             <div class="oae-clip-container">
@@ -36,7 +37,7 @@
                                 <div>
                                     <div>
                                         <h1 class="oae-threedots">${user.displayName|encodeForHTML}</h1>
-                                        <small>${user.tenant.displayName|encodeForHTML}</small>
+                                        <small class="oae-threedots">${user.tenant.displayName|encodeForHTML}</small>
                                     </div>
                                 </div>
                             </button>
@@ -47,13 +48,13 @@ <h1 class="oae-threedots">${user.displayName|encodeForHTML}</h1>
                 <div id="user-clip-right-container" class="oae-clip-container-right"><!-- --></div>
                 <div id="user-clip-right-template"><!--
                     {if user.following && user.following.canFollow}
-                        <div id="user-follow-actions" class="oae-clip oae-clip-flipped oae-clip-secondary">
+                        <div id="user-follow-actions" class="hidden-xs hidden-sm oae-clip oae-clip-flipped oae-clip-secondary">
                             <div class="oae-clip-fold">
                                 <div class="oae-clip-fold-inner"></div>
                                 <div class="oae-clip-fold-outer"></div>
                             </div>
                             <div class="oae-clip-content">
-                                <button type="button" id="user-follow">
+                                <button type="button" class="user-follow">
                                     <div>
                                         <i class="icon-bookmark pull-left"></i>
                                         <h1>__MSG__FOLLOW__</h1>
@@ -67,7 +68,7 @@ <h1>__MSG__FOLLOW__</h1>
 
             <!-- CONTENT -->
             <div data-widget="lhnavigation"><!-- --></div>
-        </div>
+        </main>
 
         <!-- FOOTER -->
         <div data-widget="footer"><!-- --></div>