ctrip enc tempalte
Merge branch 'master' of https://github.com/frankswu/myRubyTemplate

Conflicts:
	back/bean.java
	code/bean.yml