Circumventing the wrong commit 5df52ea.
Merge branch 'develop' of https://github.com/genxium/Mobile-Development into develop
Flaw fix reverted.