Merge branch 'integration_tests'

Conflicts:
	pom.xml
	serverSide/src/test/java/com/bioqwer/serverApp/dbTests/DbTesting.java
	serverSide/src/test/resources/log4j.properties
	serverSide/src/test/resources/todo.xml
Merge remote-tracking branch 'origin/master'