Merge branch 'develop' into 'issueFive'

build.gradle

...com/example/clientproject/data/adminTypes/AdminTypes.java

...example/clientproject/data/adminTypes/AdminTypesRepo.java

...ample/clientproject/data/converters/TinyIntToBoolean.java

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

...a/com/example/clientproject/data/rewards/RewardsRepo.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/java/com/example/clientproject/data/tags/Tags.java

...in/java/com/example/clientproject/data/tags/TagsRepo.java

...clientproject/data/twoFactorMethods/TwoFactorMethods.java

...ntproject/data/twoFactorMethods/TwoFactorMethodsRepo.java

...e/clientproject/data/userPermissions/UserPermissions.java

...ientproject/data/userPermissions/UserPermissionsRepo.java

...e/clientproject/data/userStampBoards/UserStampBoards.java

...ientproject/data/userStampBoards/UserStampBoardsRepo.java

...main/java/com/example/clientproject/data/users/Users.java

.../java/com/example/clientproject/data/users/UsersRepo.java