beurk .....
Merge branch 'master' of https://github.com/geobarteam/BizQuiz

Conflicts:
	BizzQuizVs.v11.suo
	www/login.html
	www/script/bizquiz.js