framework
Merge branch 'master' of https://github.com/joseaugustoneto/Qualiom-hotel

Conflicts:
	Qualiom-hotel-test/testSelenium/testJasmine.js