changed css & updated ToDO
Merge remote-tracking branch 'origin/fraenzi-branch' into simon-branch
Small bugfix and added order to admin page
Merge remote-tracking branch 'origin/simon-documentation' into simon-branch
changed css updated ToDo
Merge remote-tracking branch 'origin/fraenzi-branch' into simon-branch
Updated documentation and removed some unused functions