f
sss
Merge branch 'master' of https://github.com/py0777/mappring_manager.git

Conflicts:
	MappingManager/WebContent/WEB-INF/sqlTran.jsp