#40 Packaging
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	grails-app/conf/BuildConfig.groovy
Merge branch 'dev' of https://github.com/Ornro/ThatNight into dev