continuing work on store creation
Merge branch 'master' of https://github.com/crholm/TDDD26-G4-InternetMall

Conflicts:
	conf/routes