目录结构重整
Merge branch 'develop' of github.com:maskerliu/lynx-mapi into develop

Conflicts:
	src/test/java/com/lynx/test/weather/WeatherTest.java