Latest changes.
Merge branch 'master' of https://github.com/nielse63/scripttest

Conflicts:
	createLocal.sh