modified
Merge branch 'master' of https://github.com/manuonda/FEMobile

Conflicts:
	gen/com/fe/R.java
	gen/com/google/android/gms/R.java
creacion de Activity Sobre