added editing capabilities
Merge branch 'master' of https://github.com/viableindustries/NFWF

Conflicts:
	app/scripts/controllers/project.js
	app/styles/main.css.map