aufräumen Merge branch 'master' of https://github.com/1u/hmmm
aufräumen
Merge branch 'master' of https://github.com/1u/hmmm

schuel/hmmm,digideskio/hmmm,schuel/hmmm,Openki/Openki,Openki/Openki,schuel/hmmm,Openki/Openki,digideskio/hmmm,digideskio/hmmm