compatibilitat Rafael/Josep
Merge branch 'master' of github.com:jcanell4/WikiDojoFrontEnd

Conflicts:
	ioc/wiki30/GlobalState.js