Merge branch 'develop' of github.com:JammyPow/meowmeowbeenz-android into develop