Action Bar - Modify UI for Previous Commit
Merge branch 'develop' into feature-tablet.