error messages and suggestions for unique shorthands seem to work
Merge branch 'master' of github.com:atomim/miniohtu

Conflicts:
	src/main/webapp/WEB-INF/pages/edit.jsp