Merge branch 'master' of github.com:Myhall/PA165_DeliveryService

Conflicts:
	DeliverySystemWeb/src/main/resources/StripesResources.properties
	DeliverySystemWeb/src/main/resources/StripesResources_en.properties
	DeliverySystemWeb/src/main/resources/StripesResources_sk.properties
Merge this shit,