Prepare for deployment
Merge remote-tracking branch 'origin/master'

Conflicts:
	nwm-coauthor-webapp/src/main/resources/service.properties