buedacenas
..
Merge branch 'master' of https://github.com/jjsfoliveira/CMOVVVVV

Conflicts:
	WcfService1/App_Data/Database.mdf
	WcfService1/App_Data/Database_log.ldf
	WcfService1/BusWebService.svc.cs
	WcfService1/WcfService1.v11.suo
	WcfService1/dbModel.edmx
	WcfService1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache