More changes.
Merge branch 'deathstar' into iego

Conflicts:
	nstore.js