Merge branch 'master' of https://github.com/kibotu/criticalmass-berlin into kibotu-master

Conflicts:
	src/de/stephanlindauer/criticalmass/Main.java
	src/de/stephanlindauer/criticalmass/SplashScreen.java
	src/de/stephanlindauer/criticalmass/fragments/SuperFragment.java
	src/de/stephanlindauer/criticalmass/helper/RequestTask.java
	src/de/stephanlindauer/criticalmass/notifications/reminder/AlarmNotificationReceiver.java
Merge branch 'kibotu-master'
merge cleanup
Merge branch 'master' into kibotu-master
bugfix
Merge branch 'kibotu-master'
Merge remote-tracking branch 'github/master'

Conflicts:
	src/de/stephanlindauer/criticalmass/Main.java
	src/de/stephanlindauer/criticalmass/SplashScreen.java
	src/de/stephanlindauer/criticalmass/fragments/SuperFragment.java
	src/de/stephanlindauer/criticalmass/helper/RequestTask.java
	src/de/stephanlindauer/criticalmass/notifications/reminder/AlarmNotificationReceiver.java
	src/de/stephanlindauer/criticalmass/utils/ImageCache.java
unused imports~