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

Conflicts:
	protected/controllers/ApplicationController.php