fefe
Merge branch 'master' of https://github.com/developingo/XBTrack

Conflicts:
	xbapp/templates/xbapp/inicio.html