Merge branch 'accessfix' of https://github.com/robin92/MyGuide into android
Fixed MYGUIDE-578
Removed obsolete TODOs.