Merge origin/master

Conflicts:
	www/config.xml