bug fixes
Merge branch 'master' of https://github.com/preetigupta2000/tm.git

Conflicts:
	grails-app/controllers/com/fonantrix/tm/ProjectController.groovy
After resolving conflicts