refactor
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/team/action/InfoManagement.java