Fixed test cases, main activity now kills sync if sync is still syncing
Merge pull request #367 from pachalad/master

Fixed test cases, main activity now kills sync if sync is still syncing and mainactivity is no more