Increment version
Update profile
Merge branch 'hotfix-1.1.4' into develop

Conflicts:
	pom.xml
	war/WEB-INF/appengine-web.xml