update
Merge branch 'master' of https://github.com/jsjwk/77chi

Conflicts:
	admin/.classpath
	admin/.settings/org.eclipse.jdt.core.prefs