added tests and updated views
Merge branch 'master' of github:capacitr/cap-store