cleanup
Merge branch 'master' of https://github.com/shabanovd/Mneme

Conflicts:
	src/main/webapp/workspace.html