-
Merge branch 'master' of https://github.com/cbalatos/sprin2mvc.git

Conflicts:
	SpringMVC/src/main/webapp/emberRoutesTodo.html
	SpringMVC/src/main/webapp/js/embercontrollers/todos_controller.js
is it ok?