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/rewards/Badge.java
#	src/main/java/team5/smartTowns/rewards/Reward.java
#	src/main/java/team5/smartTowns/rewards/RewardsController.java
#	src/main/java/team5/smartTowns/rewards/Sticker.java
#	src/main/java/team5/smartTowns/rewards/data/BadgesRepository.java
#	src/main/java/team5/smartTowns/rewards/data/BadgesRepositoryJDBC.java
#	src/main/java/team5/smartTowns/rewards/data/StickersRepository.java
#	src/main/java/team5/smartTowns/rewards/data/StickersRepositoryJDBC.java