Android: Merged MainFragment with MainActivity. Fixed bug where the PlayerActivity would restart the song when coming back from another application. Now showing mini player properly when coming back from player; clicking on the mini player will go back to the player view  (i.e. recreate the Player activity).

Related to issue #406.