Merge remote-tracking branch...

Merge remote-tracking branch 'origin/73-as-a-qr-scanning-connoisseur-i-want-to-unlock-stickers-after-scanning-a-qr-code-to-feel-a-sense' into 73-as-a-qr-scanning-connoisseur-i-want-to-unlock-stickers-after-scanning-a-qr-code-to-feel-a-sense

# Conflicts:
#	src/main/java/team5/smartTowns/users/UserController.java
#	src/main/resources/data.sql
#	src/main/resources/static/css/userProfile2.css
#	src/main/resources/templates/users/userFrags.html