ActionBar working again
Merge branch 'master' of https://github.com/Nukesor/ggj14