bootstrap script fixed
Merge branch 'master' of https://github.com/gcaracuel/geoDESAbox

Conflicts:
	bootstrap.sh