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