Tricky fix for Samsung Galaxy S
Merge branch 'dev' of https://github.com/fhacktory/blurmbl-android into dev