Some minor Fixes
Merge
Fixes in twsync
Cleanup and some bugfixes
Add missing part from merge
Merge branch 'developing' of github.com:azapps/mirakel-android into developing