wygląd i menu
Merge branch 'HEAD' of https://github.com/krzaq4/MetalScrap.git into
HEAD

Conflicts:
	MetalScrap-inprogress/MetalScrap/src/main/java/pl/krzaq/metalscrap/dao/AuctionDAO.java
	MetalScrap-inprogress/MetalScrap/src/main/java/pl/krzaq/metalscrap/dao/UserDAO.java
	MetalScrap-inprogress/MetalScrap/src/main/java/pl/krzaq/metalscrap/model/Auction.java
	MetalScrap-inprogress/MetalScrap/src/main/java/pl/krzaq/metalscrap/pages/Welcome.java
	MetalScrap-inprogress/MetalScrap/src/main/java/pl/krzaq/metalscrap/quartz/jobs/CheckStartedAuctions.java
	MetalScrap-inprogress/MetalScrap/src/main/java/pl/krzaq/metalscrap/utils/ApplicationContextProvider.java
	MetalScrap-inprogress/MetalScrap/src/main/resources/app.properties
	MetalScrap-inprogress/MetalScrap/src/main/resources/hibernate.cfg.xml
	MetalScrap-inprogress/MetalScrap/src/main/webapp/WEB-INF/spring/root-context.xml
	MetalScrap-inprogress/MetalScrap/src/main/webapp/resources/style/style.css
	MetalScrap-inprogress/MetalScrap/src/main/webapp/secured/index.zul