commit from mac
Merge branch 'MultiPageView' of https://github.com/eneim/zCSN.git into
MultiPageView

Conflicts:
	gen/org/eneim/tempapp/R.java