Entities
entity saving
New saving format.
More efficient, uses cPickle
Major rewrite
Major rewrite
Merge remote-tracking branch 'origin/master' into devel

Conflicts:
	main.py
Merge remote-tracking branch 'origin/devel'

Conflicts:
	main.py
Merge branch 'devel'

Conflicts:
	main.py