adding all my modifications
Merge branch 'origin/bnj'

Conflicts:
	www/css/style.css
	www/index.html
	www/templates/connect.html
	www/templates/login.html