FB
Merge branch 'master' of https://github.com/pumpeddevs/hackathon.submit

Conflicts:
	application/controllers/auth.php