Merge branch 'develop'
Merge branch 'master' of github.com:CH-JesseMa/karma_app
pulling down from master