ok
Merge remote-tracking branch 'origin/master' into masterR

Conflicts:
	src/main/java/com/sourceit/connector/PostgresqlDBConnector.java
	src/main/java/com/sourceit/entity/Employee.java
	src/main/java/com/sourceit/entity/EmployeeList.java
	src/main/java/com/sourceit/service/DOMParser.java
	src/main/java/com/sourceit/service/JaxbConverter.java
	src/main/java/com/sourceit/service/TestService.java