Edited to support globals
Merge branch 'master' into add-export

Conflicts:
	js/chronicles.coffee
start integration for import export