Working on GcmServer
merged notifications.yml
Merge branch 'master' of github.com:noplanb/tbm-server

Conflicts:
	config/notifications.yml