mysql stuff
Merge branch 'master' of https://github.com/mattydoincode/testing

Conflicts:
	mvc3/Mdaq.WebApp/Mdaq.WebApp.csproj
	mvc3/Mdaq.WebApp/Web.config
	mvc3/Mdaq.WebApp/mytestlogfile.txt