Merge branch 'master' of zorba@192.168.100.11:questhelper