Merge remote-tracking branch 'origin/master'

Conflicts:
	legoManager-web/src/main/resources/StripesResources_cs.properties
	legoManager-web/src/main/resources/StripesResources_en.properties