Merge pull request #25 from yllekkram/master

Update
Merge pull request #26 from caleb-chan/master

Update
javadoc for dao interface and dao classes complete
javadoc for service interfaces complete
Merge pull request #27 from yllekkram/master

Testing update
- Added blackbox testing for service layer
- OrderServiceImplTest partly finished
Math.random removed and added comment showing where the order is being saved - OrderIncrement
further improvements to Order creation in presentation layer
login now returns the token id- LoginIncrement
order is now passed in to confirm Payment as per the UC summary-OrderIncrement
javadoc for entities added
isActivated fixed now will return false 
genPurchaseId changed to hash the current time to ensure better uniqueness
- Added additional servlet mapping url pattern
- Changed SimpleUrlHandlerMapping to accept wildcards
- Added video information page
- Added ability to add videos to shopping cart
- Modified dispatcher servlet url mapping to handle shopping cart changes
- Added logout function
- Fixed login specific banner logic to work correctly
- Changed mapping on shopping cart to fix runtime error
- Added logout page to the url handler
Merge pull request #28 from caleb-chan/master

Branch update
Merge branch 'loginIncrement' of https://github.com/smartelli/sysc4907-video-store-system.git into trial_merge_branch
- Changed test to reflect AccountServiceImpl.loginAccount() return value change
Merge pull request #29 from caleb-chan/trial_merge_branch

Trial merge branch
- Fixed but with logout redirect
- Changed how MyAccount page gets the login token
Merge pull request #41 from caleb-chan/master

Login and Dispatcher changes
Merge remote-tracking branch 'origin/master' into mark-master