Deploy
Deploy
Deploy
Deploy
routes
disabled ws
rename
qb add
qb add
Deploy
qb add
empty
empty
empty
empty
return
Merge branch 'master' of heroku.com:protected-river-4613

Conflicts:
	conf/application.conf
added gcm
added gcm
added gcm