"TestCase comandoAssert"
Merge branch 'origin/master'

Conflicts:
	src/main/java/com/ts/main/Enviroment.java