**
Merge branch 'origin/develop'

Conflicts:
	AutomotoraWeb/AutomotoraWeb.csproj
**
Merge branch 'origin/develop'
*