Partial commit.
Merge branch 'master' of
https://github.com/preetigupta2000/fonantrix.git

Conflicts:
	grails-app/controllers/fonantrix/ChartController.groovy
After resolving commits