change properties to match MoPaas
Merge remote-tracking branch 'origin/master'

Conflicts:
	components/web-bo/src/main/resources/application.properties