Merge branch 'master' of http://github.com/panoat/Grid-Appliance

Conflicts:
	build/deb/autofs/config
	build/deb/base/config
	build/deb/build.py
	build/deb/client/config
	build/deb/nfs/config
	build/deb/public_pool/config
	build/deb/samba/config
	build/deb/simics/config
	build/deb/ssh/config
	etc/issue
	etc/version
	scripts/condor.sh
	scripts/grid_appliance.sh
	scripts/monitor.sh
	scripts/utils.sh
	user/examples/mpi/callback_serv.py
	user/examples/mpi/condor_mpi_client.tmp.py
	user/examples/mpi/condor_mpi_util.py
	user/examples/mpi/mpi_submit.py
	user/examples/mpi/submit_mpi_vanilla
	user/examples/mpi/template_file.py