Update before push
Merge branch 'master' into John_devBranch

Conflicts:
	WebBox.Web/App_Data/WebBox.mdf
	WebBox.Web/App_Data/WebBox_log.ldf
merged with henrik_dev
fixed stuff after merge