dialect for datasource
customer rep change
merge
Merge branch 'master' of git@github.com:Nick-Kontos/Rendezvous.git

Conflicts:
	.gitignore
	grails-app/conf/BuildConfig.groovy
	grails-app/conf/DataSource.groovy