line-up
Merge branch 'master' of https://github.com/MySmallfish/SimplyLogAdmin

Conflicts:
	SimplyLogAdmin/SimplyLogAdmin/Scripts/_references.js
	SimplyLogAdmin/SimplyLogAdmin/Views/Shared/_Layout.cshtml
	SimplyLogAdmin/SimplyLogAdmin/Views/Shared/_NavbarMenu.cshtml
	SimplyLogAdmin/SimplyLogAdmin/app/common/app.js
	SimplyLogAdmin/SimplyLogAdmin/app/common/routes.js
	SimplyLogAdmin/SimplyLogAdmin/app/tenants/views/manage-tenants.html