Merge branch 'develop'
Combine play and pause button into 1

detailed in https://github.com/danieloeh/AntennaPod/issues/574
Honor User Preference on Persistence notification

commented in
https://github.com/danieloeh/AntennaPod/pull/578#issuecomment-67489354

- option disabled
notification has only "play/pause" button, hitting pause hides
notification

- option enabled
notification has both "play/pause" button and "close" button, hitting
pause does not hide notification
Adding Missing semicolon
Merge branch 'master' of git://github.com/24hours/AntennaPod into 24hours-master
Fixed persistent notification behavior on API < Jellybean
Added missing text color attribute