upgraded Ember and Bootstrap, merged changes

gui/app/router.js

@@ -21,6 +21,10 @@ export default Router.map(function () {
 		path: '/'
 	});
 
+	this.route('dashboard', {
+		path: 'dashboard'
+	});
+
     this.route('folder', {
 		path: 's/:folder_id/:folder_slug'
 	}, function() {
@@ -61,6 +65,9 @@ export default Router.map(function () {
 		this.route('auth', {
 			path: 'auth'
 		});
+		this.route('audit', {
+			path: 'audit'
+		});
 	});
 
 	this.route('setup', {