bla bla
Merge branch 'master' of https://github.com/HeLit/WebBox

Conflicts:
	WebBox.Web/App_Data/WebBox.mdf
	WebBox.Web/App_Data/WebBox_log.ldf
Merge branch 'master' of https://github.com/HeLit/WebBox
Merge branch 'master' of https://github.com/HeLit/WebBox
hmm..
Merge branch 'master' into Petter_devBranch