ActionBar
Merge branch 'master' of https://github.com/graetzer/fly2moon

Conflicts:
	App/MissionMoon/app/src/main/java/de/trivago/missionmoon/MissionFragment.java