Merge branch 'new_rules'
Merge branch 'master' of https://github.com/yannbarrault/dojo_rules