merge
merge
calendario
calendario vista portrait
merge
merge
Merge branch 'master' of
https://github.com/IIIRepublica/android-civicrm.git

Conflicts:
	AndroidManifest.xml
	gen/org/upsam/civicrm/R.java
merge
orientación portrait y uso del contact id