modals
Merge branch 'master' of https://github.com/devDesign/KarmaCloud into layout_branch