loader
Merge branch 'develop' of https://github.com/ajency/Browntape into develop

Conflicts:
	browntape/www/styles/css/style.less
	browntape/www/views/login.html