Don't replace existing apps with themselves
Merge remote branch 'origin/master'

Conflicts:
	pom.xml