- added filter
Merge branch 'master' of github.com:chrisUse/WebEntwT

Conflicts:
	OnlineShop/src/java/beans/MenuBean.java
	WebService/nbproject/project.properties