Mass commit
Merge branch 'master' of github.com:blind-squirrel/blind-squirrel

Conflicts:
	app/controllers/SetupController.php
	app/routes.php
Login now redirect you to dashboard
Merge pull request #64 from blind-squirrel/alex

Alex