add project to dropbox
test
test
update login page
Merge branch 'master' of https://github.com/boozikaa/test-https-sails-mvc-jade

Conflicts:
	.gitignore
	api/controllers/AuthenticationController.js
	api/controllers/UserController.js
	api/policies/sessionAuth.js
	assets/index.html
	assets/pages/UI/buttons.html
	assets/pages/UI/empty.html
	assets/pages/UI/general.html
	assets/pages/UI/icons.html
	assets/pages/UI/jquery-ui.html
	assets/pages/UI/sliders.html
	assets/pages/UI/timeline.html
	assets/pages/calendar.html
	assets/pages/charts/empty.html
	assets/pages/charts/flot.html
	assets/pages/charts/inline.html
	assets/pages/charts/morris.html
	assets/pages/empty.html
	assets/pages/examples/404.html
	assets/pages/examples/500.html
	assets/pages/examples/blank.html
	assets/pages/examples/invoice.html
	assets/pages/examples/lockscreen.html
	assets/pages/examples/login.html
	assets/pages/examples/register.html
	assets/pages/forms/advanced.html
	assets/pages/forms/editors.html
	assets/pages/forms/empty.html
	assets/pages/forms/general.html
	assets/pages/index.html
	assets/pages/mailbox.html
	assets/pages/tables/data.html
	assets/pages/tables/empty.html
	assets/pages/tables/simple.html
	assets/pages/widgets.html
	assets/styles/AdminLTE.css
	config/bootstrap.js
	config/policies.js
	views/authentication/login.jade
	views/layout.jade