Merge branch 'daniel' of https://github.com/kelto/software-project into daniel

Conflicts:
	java/entity/Basket.java
	java/entity/BasketProduct.java
	java/entity/Bill.java
	java/entity/Brand.java
	java/entity/Command.java
	java/entity/CommandProductPK.java
	java/entity/Comment.java
	java/entity/Product.java
	java/entity/Tag.java
	java/entity/User.java
Merge branch 'daniel' of https://github.com/kelto/software-project into daniel
Merge branch 'daniel' of https://github.com/kelto/software-project into daniel