fix version after merging 2.0.x in
Merge branch '2.0.x'

Conflicts:
	build.gradle
should not have comitted .orig file
add grails 2.3.6 to init test
Start adding User Guide documentation
configure war and zip file names correctly in verison is set after plugin added
Merge branch '2.0.x'
Merge branch 'master' into gh-pages