Actionbar now shows correct buttons for each context
Merge branch 'dev' of https://github.com/simonjrp/ESCAPE into dev