Still testing
Merge branch 'master' into integration

Conflicts:
	source/parser/pom.xml
Merge pull request #1 from dbrunkow/integration

Still testing