ok
20140103
Merge branch 'master' of https://lujunqi@github.com/caining618/ytf_cust.git

Conflicts:
	src/main/java/com/yeepay/ytf/tool/MyBatisTool.java