latest w/ mysql db
Merge branch 'master' of https://github.com/amsdias/wtu

Conflicts:
	WebApplication1/Controllers/UserController.cs
	WebApplication1/Models/Model1.edmx
	WebApplication1/Models/Model1.edmx.diagram
	WebApplication1/Models/user.cs
	WebApplication1/Views/User/Create.cshtml
	WebApplication1/Web.config
	WebApplication1/WebApplication1.csproj