Merge pull request #20 from vanita5/master

merge master into f-droid
remove gcm push
Merge branch 'f-droid'

Conflicts:
	AndroidManifest.xml
	build.gradle
	src/de/vanita5/twittnuker/activity/support/OpenStreetMapViewerActivity.java