?
* More utf-8
* README
Merge branch 'master' of git@github.com:axelw/webapp-bp.git

Conflicts:
	pom.xml