moved stuff and stuff
fixed the infamous 'upvotes'-bug
solved all current test problems
Merge branch 'master' into fix-vote