-fixed translates
-fixed translates
-fixed translates
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/cz/muni/fi/pv168/warehouse/resources/lang_cs_CZ.properties
	src/cz/muni/fi/pv168/warehouse/resources/lang_en_GB.properties
	src/cz/muni/fi/pv168/warehouse/resources/lang_en_US.properties
	src/cz/muni/fi/pv168/warehouse/resources/lang_ru_RU.properties
	src/cz/muni/fi/pv168/warehouse/resources/lang_sk_SK.properties
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/cz/muni/fi/pv168/warehouse/TODO.txt
	src/cz/muni/fi/pv168/warehouse/resources/lang_en_US.properties
-DONE just few minor fixes needed