Many changes, not stable yet
Merge branch 'master' of https://github.com/pbailhache/Nexus

Conflicts:
	Nexus.js