Logging for heroku
Merge branch 'master' of https://github.com/preetigupta2000/tm.git

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