opret
db
Merge remote-tracking branch 'origin/master'

Conflicts:
	App_Data/Shop.mdf
	App_Data/Shop_log.ldf