Merge branch 'master' of http://192.168.20.39:8989/r/LFServer

# Conflicts:
#	pom.xml
#	src/main/java/com/lf/server/controller/data/MetaController.java