Mass commit
Merge branch 'barryn' of https://github.com/blind-squirrel/blind-squirrel into barryn

Conflicts:
	app/views/admin/index.blade.php