special for callan
Merge branch 'master' of github.com:remco138/stackunderflow

Conflicts:
	MvcApplicationDatabase/App_Data/StackOverflowDatabase.mdf
	MvcApplicationDatabase/App_Data/StackOverflowDatabase_log.ldf