Fixed some stuff
Merge branch 'Develop' of https://github.com/RecruTrak/RECRUTRAK5000 into Develop

Conflicts:
	RECRUTRAK5000/res/layout/faculty_main_activity.xml