develop branch 2
Merge branch 'develop'
Merge branch 'master' of github.com:aicl/Cayita.Javascript