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

Conflicts:
	demo/.classpath
	demo/pom.xml
Merge remote-tracking branch 'origin/master'