4
Merge branch 'master' of https://github.com/FreackZoid/Flowr.git
4
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	src/main/java/ro/uaic/flowr/domain/Account.java
	src/main/webapp/img/Un produs.jpg
	src/test/java/ro/uaic/flowr/service/ProductServiceTest.java