Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/