send push notification
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/config.properties
send push notification