Bug fix.
Merge branch 'master' of git://github.com/flavour/eden

Conflicts:
	modules/eden/inv.py
Merge branch 'master' of git://github.com/flavour/eden
Cleanup