event creator
EventCreateMessage
EventCreate hour
sdasd
fuck
Merge branch 'oscar+'
shit
Merge branch 'master' into Alexis

Conflicts:
	.gitignore
	Redeactiva/gen/co/gov/coldeportes/redeactiva/redapptiva/R.java
	Redeactiva/res/values/strings.xml
	Redeactiva/src/co/gov/coldeportes/redeactiva/redapptiva/CreateEventActivity.java
	Redeactiva/src/co/gov/coldeportes/redeactiva/redapptiva/controladores/LoginController.java