ty
Merge branch 'ElolawynUbuntu'

Conflicts:
	www/index.html
	www/js/config.js