fixed bug on admin page
Merge branch 'frontend'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
added badges to sidebar navigation
removed some old commented out code
Merge branch 'master' into backend-0.0.0 to get latest frontend developments