Fix #191
Merge branch 'developing' of github.com:azapps/mirakel-android into developing