Adding config after clearing conflicts.
Merge branch 'master' of
https://github.com/preetigupta2000/fonantrix.git

Conflicts:
	grails-app/conf/Config.groovy
Adding config.grrovy after resolving conflicts.