Hibernate
Merge remote-tracking branch 'origin/master'

Conflicts:
	ManagerAPI/src/main/java/org/radixware/manager/implementation/FileNodeImplementation.java