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

Resolve "As a QR-scanning connoisseur , I want to unlock stickers after scanning a QR code to feel a sense of reward."

Closes #73

See merge request !33

Merge branch 'main' 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/data/MockUser.java
#	src/main/java/Team5/SmartTowns/data/QRCodes.java
#	src/main/java/Team5/SmartTowns/trails/TrailsController.java
#	src/main/java/Team5/SmartTowns/users/User.java
#	src/main/java/Team5/SmartTowns/users/UserRepository.java
#	src/main/java/Team5/SmartTowns/users/UserRepositoryJDBC.java
#	src/main/resources/data.sql
#	src/main/resources/schema.sql

Qr codes

Closes #49

See merge request !27

Commented out code for URL query string integration to get a functioning QR code scanner for presentation

Added some more functions for this page

Adjusted Database and CSS to account for this

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

Adjusted Database and CSS to account for this

Page also starts with pack1 selected by default

Page also starts with pack1 selected by default

# Conflicts:
#	src/main/java/Team5/SmartTowns/trails/TrailsController.java
#	src/main/resources/data.sql

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

Updated CSS to match

Removed "String pack" variable from Object Sticker