Connection between desk and mobile fixe
Merge branch 'master' of https://github.com/Corentinfardeau/NewYorkTimes

Conflicts:
	app/scripts/services/config.js
	app/views/main.html