temporary fix for cloud issue.
Merge branch 'master' of https://github.com/preetigupta2000/tm.git

Conflicts:
	grails-app/conf/BuildConfig.groovy
After resolving conflicts