Textos del calendario
actividad del calendario
Merge branch 'master' of
https://github.com/IIIRepublica/android-civicrm.git

Conflicts:
	res/values/strings.xml
jbm 19/04/2013 funcionalidad calendario
Merge branch 'master' of
https://github.com/IIIRepublica/android-civicrm.git

Conflicts:
	AndroidManifest.xml
	gen/org/upsam/civicrm/R.java
	res/values/strings.xml
	src/org/upsam/civicrm/MainActivity.java