Merge remote-tracking branch 'origin/master'

Conflicts:
	WebApplicationDevelopment/App_Data/Stocks.mdf
	WebApplicationDevelopment/App_Data/Stocks_log.ldf