#2 Landing page i18n
#2 i18n for nav-bar + merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/app/account/login/login.controller.js
	client/app/account/login/login.scss
	client/app/extendedMap/extendedMap.directive.js
	client/app/home/home.html
	client/app/my-tour/my-tour.controller.js
	client/app/my-tours/my-tours.controller.js
	client/app/my-tours/my-tours.html
	client/app/toulouse/toulouse.controller.js
	client/app/toulouse/toulouse.js
	client/components/navbar/navbar.controller.js
	server/api/tour/tour.controller.js
	server/config/environment/production.js