..
Merge branch 'master' of https://github.com/krli/InfosierrAPP.git
Merge branch 'master' of https://github.com/krli/InfosierrAPP.git

Conflicts:
	InfosierrAPP/res/layout/vista_item.xml