Merge pull request #26 from caleb-chan/master

Update
javadoc for dao interface and dao classes complete
javadoc for service interfaces complete
Math.random removed and added comment showing where the order is being saved - OrderIncrement
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
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