Merge pull request #1235 from igorko/master

fix android build
Update actionbar after upgrading powers
Merge pull request #1236 from dorkster/fixes

Update actionbar after upgrading powers