Have no idea what i'm doing
Merge branch 'ian' into gonzalo

Conflicts:
	AndroidManifest.xml
	Groups Organizer.iml
	res/layout/event_config.xml
	res/layout/event_row.xml
	res/layout/events_list.xml
	res/layout/main.xml
	res/layout/pager_view.xml
	res/layout/register.xml
	src/cl/uchile/fcfm/dcc/groupsorganizer/connection/Conexion.java
	src/cl/uchile/fcfm/dcc/groupsorganizer/connection/ConexionPost.java
	src/cl/uchile/fcfm/dcc/groupsorganizer/connection/ConexionTask.java
	src/cl/uchile/fcfm/dcc/groupsorganizer/connection/Request.java
	src/cl/uchile/fcfm/dcc/groupsorganizer/connection/TareaAsincrona.java
	src/cl/uchile/fcfm/dcc/groupsorganizer/connection/TaskCallbacks.java
	src/cl/uchile/fcfm/dcc/groupsorganizer/connection/WorkerFragment.java
	src/cl/uchile/fcfm/dcc/groupsorganizer/connection/exception/CustomException.java
	src/cl/uchile/fcfm/dcc/groupsorganizer/connection/exception/ServerErrorException.java
	src/cl/uchile/fcfm/dcc/groupsorganizer/connection/tasks/LoginConnection.java
	src/cl/uchile/fcfm/dcc/groupsorganizer/ui/CustomFragmentActivity.java
	src/cl/uchile/fcfm/dcc/groupsorganizer/ui/Login.java