Action bar is now working for all activities
Merge remote-tracking branch 'origin/master'