11th commit
first conflict

Conflicts:
	www/js/config.js
	www/js/init.js