Increment version number
Update introduction
Merge branch 'hotfix-1.1.3' into develop

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