updates on the environment
Merge branch 'master' of https://github.com/LionelMartin/Setup

Conflicts:
	setup_env.sh