removed local settings
Merge branch 'develop' of github.com:ReadBox/readbox
Merge branch 'master' of github.com:ReadBox/readbox into develop