Merge branch 'master' of https://github.com/jdevelopersPL/hypermarket

Conflicts:
	.gitignore
	hypermarket-wholesale/src/main/java/pl/jdevelopers/hypermarket/wholesale/web/security/config/UserService.java