renew
new branch
new
fix
change properties
new
new
first commit from mac
Merge branch 'master' of https://github.com/eneim/zCSN

Conflicts:
	src/org/eneim/tempapp/MainActivity.java
	src/org/eneim/tempapp/view/MainView.java