New login/signup modal
Merge branch 'master' of https://github.com/m1ck3y/hackspace

Conflicts:
	app/controllers/UserController.php
	app/views/global/header.blade.php
	app/views/user/modal.blade.php