create
filter...
Merge branch 'master' of https://github.com/DenisMd/Manager into Stuff

Conflicts:
	WebInterface/src/main/webapp/workspace.jsp