Added 2 dummy buttons and change ID name for action bar buttons
Merge remote-tracking branch 'origin/master'