canvis menors
Merge branch 'master' of github.com:jcanell4/WikiDojoFrontEnd

Conflicts:
	ioc/dokuwiki/processAceEditor.js