Sundries
Merge branch 'master' of https://github.com/bdscott/hack-junkie

Conflicts:
	app/Model/ApplicationModel.php
	app/View/Applications/index.ctp