final version
Merge branch 'master' of https://github.com/sDruschel/private

Conflicts:
	htdocs/redmine_create-vhost.php