Merge pull request #1 from felixebert/master

Haushaltsplanentwurf 2014
Merge remote-tracking branch 'origin/master'