Merge remote-tracking branch 'origin/master'

Conflicts:
	App_Data/Database.mdf
	App_Data/Database_log.ldf