fix edit/fix bugs

Conflicts:
	modern-project/app/scripts/main.js
	modern-project/app/scripts/model.js