modularize
modularize
Merge remote-tracking branch 'origin/master'

Conflicts:
	docs/DataDefinitions.ods
	public/js/services/view.js
	public/js/services/world.js