Merge branch 'master' of https://github.com/bergsysteme/buggy

Conflicts:
	buggy/pom.xml
Merge branch 'master' of github.com:bergsysteme/buggy