# Conflicts:
#	README.md
#	src/main/webapp/assets/common/static/stylefeng/feng.js