[svn] last changes from yesterday so that i can continue working in school on it --HG-- branch : trunk