Add admin views
Add admin views
Add AdminController.js

Conflicts:
	app/index.html
	app/scripts/application.js
	app/scripts/init.js
	app/scripts/main.js
Make Admin into a Marionette sub-application

Conflicts:
	app/scripts/controllers/AppController.js
Delete unusable folder and files
Implement routes on Admin Marionette sub application

Conflicts:
	app/scripts/application.js
	bower.json
Add setting of active menu in admin menu options
Remove views with simalar templates.
Use text template instead of hbs templates

Conflicts:
	app/scripts/controllers/AppController.js
Add className hash to composite and items views

Conflicts:
	app/scripts/communicator.js
	app/scripts/controllers/AppController.js
Fixed errors on `grunt test`.

Conflicts:
	app/scripts/init.js
	bower.json
Fixed some module mismatch between test and application

Conflicts:
	app/index.html
	app/scripts/application.js
	app/scripts/communicator.js
	app/scripts/init.js
	app/scripts/main.js
Added signup functionality
Fixed some conflicts during rebase. Changed bootstrap UI theme.

Conflicts:
	bower.json
	server/schemas/SkillsSchema.js
Fix error during testing after rebase from upstream.
Change bootstrap theme to united
Enhance UX a little on the admin dashboard
Fix error after merging conflictss

Conflicts:
	app/scripts/controllers/AppController.js
Integrate Admin Dashboard
Fixed MiddlewareRouter declaration in test require config. Added chai to package.json