Merge branch 'master' into develop
Merge branch 'develop' of https://github.com/medic/kujua-lite into develop
Merge branch 'develop' of https://github.com/medic/kujua-lite into develop
Merge branch 'develop' of https://github.com/medic/kujua-lite into develop
Adding kanso-app-settings support for keeping app_settings across pushes