clean
Merge branch 'master' of https://github.com/acemtp/meteor-france

Conflicts:
	server/news.js
Merge branch 'master' of https://github.com/acemtp/meteor-france
joboard page
Merge branch 'master' of https://github.com/acemtp/meteor-france

Conflicts:
	router.js