temp changes
Merge branch 'develop' of https://github.com/FIU-SCIS-Senior-Project-2014-Fall/Collaborative-Platform-Ver3 into develop

Conflicts:
	protected/models/User.php
test
personal mentor application functional
personal mentor app functional