Merge branch 'develop' into 'issueTen'

.../java/com/example/clientproject/data/rewards/Rewards.java

...main/java/com/example/clientproject/data/shops/Shops.java

.../java/com/example/clientproject/data/shops/ShopsRepo.java

...m/example/clientproject/data/stampBoards/StampBoards.java

...ample/clientproject/data/stampBoards/StampBoardsRepo.java

src/main/resources/database/Data Script/script.sql

src/main/resources/database/WeekTwoERD.png

src/main/resources/database/schema.sql

src/test/resources/schema-test-h2.sql

src/test/resources/script-test-h2.sql