项目调整
Merge branch 'develop' of github.com:maskerliu/lynx-web into develop

Conflicts:
	src/main/java/com/lynx/geo/service/dao/LocationDao.java
	src/main/java/com/lynx/geo/service/dao/OffsetDao.java
	src/main/java/com/lynx/info/controller/RSSController.java
	src/main/java/com/lynx/info/entity/RSS.java
	src/main/java/com/lynx/info/entity/RSSInfo.java
	src/main/java/com/lynx/info/service/RSSService.java
	src/main/java/com/lynx/info/service/dao/InfoDao.java
	src/main/java/com/lynx/info/service/impl/RSSServiceImpl.java
	src/main/java/com/lynx/info/util/RssReader.java
	src/main/java/com/lynx/info/util/SinaRSSUtil.java
	src/test/java/com/lynx/test/dexconfig/DexConfigTest.java
	src/test/java/com/lynx/test/geo/GeoServiceTest.java
	src/test/java/com/lynx/test/info/RSSTest.java