Added BaseActivity and MusicService