Fix conflict
Merge branch 'master' of github.com:skempken/rap-demo

Conflicts:
	rapdemo-rap/pom.xml