upgrade Grails to 2.1.1
add ~ backup files
cleanup
manage env var GIT_COMMIT
merge env var branch