conflick
ss
Merge branch 'master' of https://github.com/coriger/supr

Conflicts:
	src/main/webapp/WEB-INF/admin/register.jsp
	src/main/webapp/js/supr.js