+ products management can now filter by search and category at the same
time.
Merge branch 'master' of https://github.com/boldeagle3/MartyParty.git

Conflicts:
	WebContent/MainFile.jsp