Merge branch 'release_branch_1.0'

"merging release branch"
Merge branch 'master' of https://github.com/Kavyahs/dojo_rules
"merge rs"
:wq