Assets introduced
Merge remote-tracking branch 'origin/master' into spring

Conflicts:
	pom.xml