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

Conflicts:
	gen/org/eneim/tempapp/R.java
add context
clean code
new change ?
Revert "new change ?"

This reverts commit 8a66eeebf6f468dcd6f7f48579fdeaa062e43300.
merge
Merge branch 'MultiPageView' of https://github.com/eneim/zCSN into MultiPageView

Conflicts:
	src/org/eneim/tempapp/fragments/MainFragmentActivity.java
merge branch MultiPageView
add showContent(), unchecked.