Cambios varios interfaz
Merge branch 'master' of https://github.com/sebafra/In-Tkr

Conflicts:
	js/constants.js