Merge branch 'master' of https://github.com/websuperheroes/stormcrow into dev

Signed-off-by: Dave <davidajberner@gmail.com>

Conflicts:
	app/views/pages/login.html
Changed mixins to extends where appropriate

Signed-off-by: Dave <davidajberner@gmail.com>
Merge branch 'refs/heads/dev'