Too much work done to less commits (My fault :'()

Sorry in advance I will cleanup a lot tomorrow (08.08.2013)
Promised ;)