added browse functionality for service and data access layer- browseIncrement
changed Order Service Layer and data access layer- orderIncrement
added video access service and data access layer features- accessVideoIncrement
videoInfo - releaseDate was re-added to the entity as a column(it must have been overwritten)
Admin data access & Admin service layer complete- manageVideoIncrement
Merge pull request #16 from caleb-chan/master

Update trial branch
- Merged Sam's changes from his logincontroller branch
- Commented out broken unit test from newest update to code
Merge pull request #17 from caleb-chan/trial_merge_branch

Merge from trial branch
- Added temp code for testing if playback is working correctly
- Fixed post request to get current time of video when saving it
- Removed "Are you sure?" message
- Root folder for application is "C:\glassfish3\glassfish\domains\domain1\applications"
Merge pull request #18 from caleb-chan/trial_merge_branch

- Added temp code for testing if playback is working correctly
send banner search term as URL parameter
Revert "rename BrowseVideoController to VideoInfoController"

This reverts commit 7fde7171ebd2491778b6c3f7e656c94208fa9bc5.

Conflicts:
	VSS-web/src/main/java/com/team33/controllers/BrowseVideosController.java
	VSS-web/src/main/webapp/WEB-INF/dispatcher-servlet.xml
	VSS-web/src/main/webapp/WEB-INF/views/browseVideos.jsp
removedAdmin -
fixed Entities (streamLocation -how will you recover filepath from webclient)
added transaction fixes- fixes still in progress
--
Sam
entities- author name change
services- begin transaction statements added and adapted for current db structure
browseFeature of grab a single video for presentation layer added- browseIncrement
- Made changes to the banner
	- Added nav links
	- Reorganized position of search bar, register and login buttons
- Added banner to registerAccountView
Merge pull request #19 from caleb-chan/master

Update branch
- Merge Sam's changes(Feb 13, 2013 6:25 PM)
- Fixed compile error from merge
- Fixed compile error from merge
Merge pull request #20 from caleb-chan/trial_merge_branch

Merged Sam's branch and compile error fixes (Feb 13, 2013 6:27 PM)
Merge pull request #26 from caleb-chan/master

Merged Sam's branch and compile error fixes (Feb 13, 2013 6:27 PM)
- Removed the banner_style.css and moved code into banner.jspf
- Minor display changes
- Added an page for My Account