replace src by ng-src
refine back end

Conflicts:
	server.js