Elections 2013
Merge branch 'master' of https://github.com/cruzer45/elections

Conflicts:
	grails-app/conf/BootStrap.groovy
	grails-app/conf/Config.groovy
	grails-app/views/layouts/main.gsp