1
Merge branch 'master' of https://github.com/SQALviv/framework

Conflicts:
	sqa/target/maven-archiver/pom.properties
	sqa/target/sqa-0.0.1-SNAPSHOT.jar