Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app/Controller/ServiciosMobilesController.php
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/riter'
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app/Controller/ServiciosMobilesController.php