refactoring.
more refactoring, added discount field. sync with session storage
category, subcategory, views update
merge with leisbranch