Fixed program title
Removed unnecessary ActionAdapter class
Merge branches 'fixes' and 'master'