wrote query to sum up the number of watchlist entries for an exercise id, then wrote the test and merged development into my branch

progress bar dispalys numbers now, trophy beside progress bar to see what kind of challenge the user is doing, reordered tropies, added disclaimer if no trophy has been achieved or if all trophies have been achieved, improved sql query to get both results at once, improved layout