added a checkbox for demo content when creating a new store
Merge branch 'master' of https://github.com/crholm/TDDD26-G4-InternetMall
Fixed the bug where the user could not be found. Fixed the create-shop-redirect so it works even when not in production mode. Commented some code.
conflict fix in application.java