Merge branch 'master' into sync-api
Merge branch 'master' into sync-api
Fixed file browser typo
Merge branch 'sync-api' of ssh://localhost:2222/home/mpcjanssen/repos/simpletask-android into sync-api