Merge branch 'master' of https://github.com/balthie/balthie.git

Conflicts:
	demo/pom.xml
Merge branch 'master' of https://github.com/balthie/balthie.git