more changes
Merge branch 'master' of github.com:zlkoh/careershire

Conflicts:
	application/start.php
	public/js/site.js
trs