conflicts resolved

module sdcoServices added

Update catalog

all resources added to make work protractor easily

Ease protractor use

remove comments which make fake differences between branches....

retrieve from step9_bis
Merge branch 'step9' of https://github.com/got5/TrainingAngularJS into step9

Conflicts:
	app/data/news.json
	app/js/controllers/DetailController.js
	app/js/controllers/LoginController.js
	app/js/filters/startFrom.js
	app/js/sdco/sdco.js
	app/js/sdco/services/UserServices.js
	test/unit/UserServiceSpec.js