Merge branch 'feature_jzcn' into develop
ignore list
Merge branch 'develop' of https://github.com/kevinzhoucn/rails_example into feature_jzcn