merge
Merge branch 'master' of
https://github.com/TheConnMan/AWS-Hackathon-2014.git

Conflicts:
	grails-app/views/home/index.gsp
postgres DB