Fix saving
Fix options
Merge branch 'editing' into fix-saving

Conflicts:
	src/scripts/models/contents/node.coffee
Make content model as changed when adding/remove nodes
Merge pull request #436 from Connexions/fix-saving

EDITING: Fix saving