- Fixed bug  with null pointer error when getting account
- Added missing test
- Added shopping cart entity
- Modified shopping cart controller to use entitiy
- Changed view to use new rental and purchase mappings
Merge branch 'master' of https://github.com/caleb-chan/sysc4907-video-store-system.git
Merge pull request #45 from caleb-chan/master

Shopping cart update
Merge pull request #44 from yllekkram/mark-master

Mostly cleaning up some code
Revert "Merge pull request #44 from yllekkram/mark-master"

This reverts commit 4b84164a3e6a772351d4b9c6f5a9b4d6e3824237, reversing
changes made to ae7d29cc385dff3e2bae78ef4954d12e0af5992f.
Revert "Revert "Merge pull request #44 from yllekkram/mark-master""

For an explanation, see:
https://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.txt

This reverts commit e942142382bd41e487b71b8a2e9d3fe3dca7f58e.
Merge branch 'master' into mark-master