asdf
Merge branch 'master' of https://github.com/ianyon/Groups-organizer

Conflicts:
	res/layout/main.xml
	src/cl/dcc/Groups_Organizer/ui/Login.java
	target/generated-sources/androidannotations.log
	target/generated-sources/annotations/cl/dcc/Groups_Organizer/ui/PagerViewHost_.java
Arreglado problema en que los contenidos de la carpeta site estaban en la raiz del repositorio.