Upravene zobrazovanie settingov, buttony na dump a load, zatial nefunkcne!
Merge branch 'master' of https://github.com/hektokotylove-rameno/skladisko

Conflicts:
	skladisko/db/seeds.rb
Merge branch 'master' of https://github.com/hektokotylove-rameno/skladisko

Conflicts:
	skladisko/app/controllers/settings_controller.rb