[LEMG] Se agrega peticion de taxi al api trinus
[LEMG] Peticion de servicio
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/view/menu/MenuPanel.js
	app/view/principal/Panel.js
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/view/menu/MenuPanel.js
	app/view/principal/Panel.js
[LEMG] Peticion ajax de taxi &  Merge remote-tracking branch 'origin/master'

Conflicts:
	app/view/login/FormPanel.js
	app/view/menu/FormPanel.js