Merge pull request #1 from jhwing/develop

Develop
add action bar
Merge pull request #2 from romeoxmfx/develop

Develop