[PX00]:settings
Merge branch 'master' of https://github.com/dvera123/project-x.git

Conflicts:
	src/main/java/com/projectx/model/implement/TestCaseDAOImpl.java
	src/test/java/com/projectx/test/TestStep.java