avances en la pantalla de agregar sesion
Merge branch 'master' of https://github.com/ggiudice/including

Conflicts:
	app/lib/services/Service.js
Avances en el listado de ponderaciones. Creacion de un componente de OpcionDialog separando para iOs y Android
Merge branch 'master' of https://github.com/ggiudice/including

Conflicts:
	app/controllers/index.js
	app/lib/base/BaseViewController.js