no message
Merge branch 'master' of https://github.com/FIU-SCIS-Senior-Project-2014-Fall/Catalog-Management-System-Ver2

Conflicts:
	curriculumdb/protected/runtime/application.log
Merge branch 'master' of https://github.com/FIU-SCIS-Senior-Project-2014-Fall/Catalog-Management-System-Ver2