Merge
Merge branch 'develop' of https://github.com/Gpetkov/BarManagementSystemTuSofia into develop

Conflicts:
	BarManagementSystemUniversity/build/classes/com/tu/sofia/bg/model/User.class
	BarManagementSystemUniversity/src/com/tu/sofia/bg/model/User.java
Merge branch 'develop' of https://github.com/Gpetkov/BarManagementSystemTuSofia into develop

Conflicts:
	BarManagementSystemUniversity/.classpath
	BarManagementSystemUniversity/WebContent/WEB-INF/classes/META-INF/persistence.xml
	BarManagementSystemUniversity/WebContent/WEB-INF/lib/required/hibernate-commons-annotations-4.0.1.Final.jar
	BarManagementSystemUniversity/WebContent/WEB-INF/lib/required/hibernate-core-4.1.4.Final.jar
	BarManagementSystemUniversity/WebContent/WEB-INF/lib/required/hibernate-jpa-2.0-api-1.0.1.Final.jar
	BarManagementSystemUniversity/build/classes/com/tu/sofia/bg/dummy/TestHibernate.class
	BarManagementSystemUniversity/build/classes/com/tu/sofia/bg/model/Item.class
	BarManagementSystemUniversity/build/classes/com/tu/sofia/bg/model/ModelBase.class
	BarManagementSystemUniversity/build/classes/com/tu/sofia/bg/model/ModelListener.class
	BarManagementSystemUniversity/build/classes/com/tu/sofia/bg/model/OrderStatus.class
	BarManagementSystemUniversity/build/classes/com/tu/sofia/bg/model/Table.class
	BarManagementSystemUniversity/build/classes/com/tu/sofia/bg/model/entitymanagers/TableManager.class
	BarManagementSystemUniversity/src/com/tu/sofia/bg/dummy/TestHibernate.java
	BarManagementSystemUniversity/src/com/tu/sofia/bg/model/Item.java
	BarManagementSystemUniversity/src/com/tu/sofia/bg/model/ModelBase.java
	BarManagementSystemUniversity/src/com/tu/sofia/bg/model/ModelListener.java
	BarManagementSystemUniversity/src/com/tu/sofia/bg/model/OrderStatus.java
	BarManagementSystemUniversity/src/com/tu/sofia/bg/model/Table.java
	BarManagementSystemUniversity/src/com/tu/sofia/bg/model/entitymanagers/TableManager.java
clean