WIP
Still WIP
Merge remote-tracking branch 'origin/master' into PowerBar
Action Bar done! Maybe...
Merge with master