JPA
Merge branch 'master' of https://github.com/mikhail-hryshyn/JMP-2014-Mikhail-Hryshyn-Group-1

Conflicts:
	jpa-task/build/classes/META-INF/persistence.xml
	jpa-task/build/classes/com/jpa/entity/Employee.class
	jpa-task/build/classes/com/jpa/entity/EmployeeStatus.class
	jpa-task/build/classes/com/jpa/entity/Personal.class
	jpa-task/build/classes/com/jpa/entity/Unit.class
	jpa-task/src/META-INF/persistence.xml
	jpa-task/src/com/jpa/entity/Employee.java
	jpa-task/src/com/jpa/entity/Personal.java
	jpa-task/src/com/jpa/entity/Unit.java