opravy operacii a filtrovania operacii
Merge branch 'master' of https://github.com/hektokotylove-rameno/skladisko

Conflicts:
	skladisko/app/models/operation.rb
Merge branch 'master' of https://github.com/hektokotylove-rameno/skladisko