resources
Merge remote-tracking branch 'origin/master'

Conflicts:
	App_Data/BICC.mdf
	App_Data/BICC_Log.ldf