copy hbm mapping files for rest-api access
update rest config
Merge remote-tracking branch 'origin/master'

Conflicts:
	webapp/pom.xml