Menu activity
Merge branch 'master' of https://bitbucket.org/veskoski/openaccess
Push notifications working (via a web frontend)
Merge branch 'master' of bitbucket.org:veskoski/openaccess

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/strings.xml