GENERATED: adding travis-ci.org support
grails.project.groupId set to au.org.ala in order to deploy the war file into the correct dir/package structure
Merge remote-tracking branch 'upstream/master'

Conflicts:
	application.properties
Merging from master