added action bars for demo
Removed actionbar stuff that was added for demo
Removed actionbar stuff that was added for demo
resolved conflicts and removed demo code.