Fix bug in CABbar
Fix #270
+Fix some other file-relatet bugs in the reimplementation
Merge branch 'mirakel2.2' of github.com:azapps/mirakel-android into mirakel2.2