Instantiate Ticket View Models & Converter
Merge branch 'master' of https://github.com/sallesma/GLO4003

Conflicts:
	src/main/java/com/glo4003/project/database/model/MatchModel.java
	src/main/java/com/glo4003/project/database/model/UserModel.java
	src/main/java/com/glo4003/project/match/controller/MatchController.java
	src/main/java/com/glo4003/project/match/helper/MatchConverter.java
	src/main/java/com/glo4003/project/match/helper/MatchFilter.java
	src/main/java/com/glo4003/project/shoppingkart/controller/ShoppingCartController.java
	src/main/java/com/glo4003/project/user/helper/UserConverter.java
Solve conflicts on ConcreteModels