Should fix #209 + Some Layoutfixes
Merge branch 'developing' of github.com:azapps/mirakel-android into developing