Mostar Info Empresa
Merge branch 'Hellen' of https://github.com/jerivemo/Ubitec into Hellen

Conflicts:
	Ubi/Ubitec/gen/com/ncq/ubi/R.java
	Ubi/Ubitec/src/com/ncq/ubi/MainActivity.java