added proxy
Merge branch 'task-5' into task-7
Merge branch 'task-6' into task-7
Fixes from storeable
tests
Merge branch 'task-6' into task-7
more fixes from storeable
epic fail fixed
all fixed
tests added and some fixes
tiny fix and checkstyle
Merge pull request #482 from penguin138/task-7

Nastya Torunova, 396, Proxy