Sprint 28.11.2013

Merged Branches Andi/Steffen, Chris and Nico
Added some styles
Fixed some bugs (not perfect)