Added dojo 1
Merge branch 'master' of https://github.com/Oncedev/coding-dojo

Conflicts:
	boilerplates/js/.vagrant/machines/default/virtualbox/action_provision
	boilerplates/js/.vagrant/machines/default/virtualbox/action_set_name
	boilerplates/js/.vagrant/machines/default/virtualbox/id