2013-3-28
Merge branch 'master' of git@github.com:chenyuelin/JavaExplorer.git

Conflicts:
	static/WebContent/sp3.1/management/person.js