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

Conflicts:
	InfosierrAPP/src/es/ulpgc/IST/infosierrapp/main/MenuActivity.java
..