- log
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/cz/muni/fi/pv168/warehouse/resources/lang_en_GB.properties