vddm commit changes
Merge remote-tracking branch 'origin/mergedScenes' into mergedScenes

Conflicts:
	test/cucumber/Ferramenta.feature
	test/cucumber/Member.feature
	test/cucumber/ResearchLine.feature
	test/cucumber/Thesis.feature