Fixed zip file name
Documentation update
Change directory for building documentation
Merge branch 'master' into develop

* master:
  Change directory for building documentation
  Documentation update
  Fixed zip file name

Conflicts:
	grails-app/conf/BuildConfig.groovy