attempting to push to git after an error
Merge branch 'master' of https://github.com/moshie/super-admin

Conflicts:
	app/start/global.php
	app/views/admin/dashboard/dash.blade.php
	app/views/admin/dashboard/layout/master.blade.php
	app/views/admin/layout/master.blade.php
	app/views/admin/login.blade.php
	bower.json
	public/admin/resources/styles/css/style.css