Removed IP address from config.php
Merge remote-tracking branch 'origin/develop' into develop
Add IP address to config.php and some text.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	web/config.php