usertag editing in decide
Merge branch 'master' into sauerbraten