testes
Merge branch 'master' of https://github.com/joseaugustoneto/QFramework

Conflicts:
	server.js
	www/qtest/qtest.js
	www/qtest/testHotel2.js