bug fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	NetCollab.Web/App_Data/Nc.mdf
	NetCollab.Web/App_Data/Nc_log.ldf