Merge branch 'master' of https://github.com/monorm/ShellScripts

Conflicts:
	servers/development.www.donefine.com.sh
fix