merge changes
Merge branch 'master' of https://github.com/edcalo/HostingManager

Conflicts:
	src/tmp/logs/error.log