Bug fix
Merge branch 'developing' of github.com:azapps/mirakel-android into developing
Bugfix + cleanup
Merge branch 'developing' of github.com:azapps/mirakel-android into developing