add: entry to .hgignore
merge w/ magarena
merge w/ magarena
merge changes from landhotelwesterwald-magarena