refine back end

Conflicts:
	routes/api.js
use bower
fix bower import in html

Conflicts:
	app/index.html

Conflicts:
	app/index.html
fix import
ng-src
Merge pull request #23 from Sfeir/step-11-editableinput

Step 11 editableinput
Merge pull request #54 from lauterry/step-11-editableinput

update from upstream