modal changes & bug fixes
Merge branch 'cost-feature' of https://github.com/Fathalian/nestor into cost-feature

Conflicts:
	app/scripts/controllers/codeGen.js