added some things very important like depto and muni for user
se agrega algo que faltaba en el login
Merge branch 'master' of https://github.com/ReyesMagos/Redeactiva

Conflicts:
	Redeactiva/.classpath
ASDAS
Merge branch 'oscar+'
Merge branch 'master' into Alexis

Conflicts:
	.gitignore
	Redeactiva/bin/R.txt
	Redeactiva/gen/android/support/v7/appcompat/R.java
	Redeactiva/gen/co/gov/coldeportes/redeactiva/redapptiva/R.java