Merge branch 'master' of C:\Users\Glenn\IdeaProjects\StrategoWebApp with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/controllers/JsonController.java
jsoncontroller getstats, win, gamehistory added
various changes in model.User
recreate database needed when updating
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/controllers/JsonController.java