made a browseVideos page
rename BrowseVideoController to VideoInfoController
add dynamic sections to browseVideos.jsp
Merge remote-tracking branch 'origin/master' into mark-master

Conflicts:
	VSS-web/src/main/webapp/WEB-INF/dispatcher-servlet.xml
	VSS-web/src/main/webapp/index.jsp
Merge remote-tracking branch 'origin/master' into mark-master
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
cleaning up browseVideos
Merge remote-tracking branch 'origin/master' into mark-master

Conflicts:
	VSS-web/src/main/webapp/WEB-INF/dispatcher-servlet.xml
	VSS-web/src/main/webapp/WEB-INF/jspf/banner.jspf
add name to input field so that it appears as URL parameter
Merge remote-tracking branch 'origin/master' into mark-master

Conflicts:
	VSS-web/src/main/webapp/WEB-INF/dispatcher-servlet.xml
change browse link in banner to point to correct broswe page
Merge remote-tracking branch 'origin/master' into mark-master
Merge pull request #36 from yllekkram/mark-master

Please merge my branch into master