Work commit.
Merge branch 'master' of https://github.com/krsticivan/PortalGit.git

Conflicts:
	portal/src/main/java/rs/apotekapozarevac/portal/entity/Branch_.java
	portal/src/main/java/rs/apotekapozarevac/portal/entity/Institution_.java
	portal/src/main/java/rs/apotekapozarevac/portal/entity/Office_.java
	portal/src/main/java/rs/apotekapozarevac/portal/entity/SpecialSale_.java
work...