Update.
Removed the general host parameter.
Merge branch 'dev' of github.com:RBertram/Webbins-Framework into dev
Merge branch 'dev' of github.com:RBertram/Webbins-Framework

Conflicts:
	config.php
asdf