controllers
Merge remote-tracking branch 'origin/master'

Conflicts:
	conf/routes
Edited contacPerson by adding instution ID on it, and some controllers
Merge remote-tracking branch 'origin/master'