editovani stavebnic
Merge remote-tracking branch 'origin/master'

Conflicts:
	legoManager-web/src/main/webapp/brick/brickList.jsp