Merge branch 'master' of https://github.com/jonatan2m/modulojs

Conflicts:
	extensions/pubsub.js
	imports/mod.js
	modulo.js
Merge branch 'master' of https://github.com/jonatan2m/modulojs

Conflicts:
	extensions/pubsub.js
	imports/mod.js
	modulo.js