tocando main
Merge branch 'master' of https://github.com/csaluigm/ADM2013.git

Conflicts:
	src/com/adm/geoadm/MainActivity.java
filtro en main
Merge branch 'master' of https://github.com/csaluigm/ADM2013.git