Misc bug fixes and merge patch
Merge branch 'master' of https://github.com/snipertomcat/jobeet

Conflicts:
	app/logs/dev.log