Merge branch 'master' of github.com:aerogear/aerogear-unified-push-server
Merge branch 'master' of github.com:aerogear/aerogear-unified-push-server