New save and save graph
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	js/controllers/mainController.js