temporal
Merge branch 'master' of https://github.com/kunotatemaki/ComunioElPuntalApp

Conflicts:
	gen/ruler/elpuntal/comunio/androidapp/R.java
Merge branch 'master' of https://github.com/kunotatemaki/ComunioElPuntalApp

Conflicts:
	gen/ruler/elpuntal/comunio/androidapp/R.java