12
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/java/ru/efimov/batch/listener/ImportEmployeeJobListener.java
	src/main/java/ru/efimov/controllers/EmployeeController.java
	src/main/java/ru/efimov/services/SpringJpaSample.java
	src/main/resources/log4j.xml
	src/main/webapp/WEB-INF/log4j.xml
Пошел спать 24-06-2013_0:43