Merge origin/master

Conflicts:
	src/java/model/Product.java