Dynamic Agenda
Merge branch 'master' of https://github.com/vnun3s/EncontroDaCidadania

Conflicts:
	bin/MainActivity.apk
	bin/classes.dex
	bin/classes/br/org/cdicampinas/encontrodacidadania/R$id.class
	bin/classes/br/org/cdicampinas/encontrodacidadania/R$layout.class
	bin/classes/br/org/cdicampinas/encontrodacidadania/R$menu.class
	bin/classes/br/org/cdicampinas/encontrodacidadania/R$string.class
	bin/classes/br/org/cdicampinas/encontrodacidadania/R$style.class
	bin/resources.ap_
	gen/br/org/cdicampinas/encontrodacidadania/R.java
More files