Merge origin/dev into dev

Conflicts:
	wifi-main/src/main/java/com/jyzn/wifi/dao/shop/ValidateLogDao.java
	wifi-main/src/main/java/com/jyzn/wifi/service/shop/ShopService.java
	wifi-main/src/main/java/com/jyzn/wifi/web/SystemCommonController.java
	wifi-main/src/main/webapp/WEB-INF/page/shop/basePath.html
	wifi-main/src/main/webapp/WEB-INF/page/shop/index.html
	wifi-main/src/main/webapp/resource/script/paging/index.html
	wifi-main/src/main/webapp/resource/shop/css/shop-item.css
	wifi-main/src/main/webapp/resource/shop/script/jeekly.tools.js
	wifi-main/src/main/webapp/resource/shop/script/main.js
	wifi-main/src/main/webapp/resource/shop/script/main2.js
	wifi-main/src/main/webapp/resource/shop/script/main3.js
	wifi-main/src/main/webapp/resource/shop/script/main4.js
	wifi-main/src/main/webapp/resource/shop/script/main4page.js
	wifi-main/src/test/java/com/jyzn/wifi/test/shop/dao/ValidateLogDaoTest.java
	wifi-main/src/test/java/com/jyzn/wifi/test/shop/service/ShopServiceTest.java
Merge origin/dev into dev
增加logo，修改密码，退出登录后合并代码

Conflicts:
	wifi-main/src/main/java/com/jyzn/wifi/dao/shop/ValidateLogDao.java
	wifi-main/src/main/java/com/jyzn/wifi/service/shop/ShopService.java
	wifi-main/src/main/java/com/jyzn/wifi/web/SystemCommonController.java
	wifi-main/src/main/webapp/WEB-INF/page/shop/basePath.html
	wifi-main/src/main/webapp/WEB-INF/page/shop/index.html
	wifi-main/src/main/webapp/resource/script/paging/index.html
	wifi-main/src/main/webapp/resource/shop/css/shop-item.css
	wifi-main/src/main/webapp/resource/shop/script/jeekly.tools.js
	wifi-main/src/main/webapp/resource/shop/script/main.js
	wifi-main/src/main/webapp/resource/shop/script/main2.js
	wifi-main/src/main/webapp/resource/shop/script/main3.js
	wifi-main/src/main/webapp/resource/shop/script/main4.js
	wifi-main/src/main/webapp/resource/shop/script/main4page.js
	wifi-main/src/test/java/com/jyzn/wifi/test/shop/dao/ValidateLogDaoTest.java
	wifi-main/src/test/java/com/jyzn/wifi/test/shop/service/ShopServiceTest.java
Merge origin/dev into dev
增加logo，修改密码，退出登录后合并代码

Conflicts:
	wifi-main/src/main/java/com/jyzn/wifi/dao/shop/ValidateLogDao.java
	wifi-main/src/main/java/com/jyzn/wifi/service/shop/ShopService.java
	wifi-main/src/main/java/com/jyzn/wifi/web/SystemCommonController.java
	wifi-main/src/main/webapp/WEB-INF/page/shop/basePath.html
	wifi-main/src/main/webapp/WEB-INF/page/shop/index.html
	wifi-main/src/main/webapp/resource/script/paging/index.html
	wifi-main/src/main/webapp/resource/shop/css/shop-item.css
	wifi-main/src/main/webapp/resource/shop/script/jeekly.tools.js
	wifi-main/src/main/webapp/resource/shop/script/main.js
	wifi-main/src/main/webapp/resource/shop/script/main2.js
	wifi-main/src/main/webapp/resource/shop/script/main3.js
	wifi-main/src/main/webapp/resource/shop/script/main4.js
	wifi-main/src/main/webapp/resource/shop/script/main4page.js
	wifi-main/src/test/java/com/jyzn/wifi/test/shop/dao/ValidateLogDaoTest.java
	wifi-main/src/test/java/com/jyzn/wifi/test/shop/service/ShopServiceTest.java
Merge origin/dev into dev

Conflicts:
	wifi-main/logs/biwifi-2014-09-22.log
	wifi-main/logs/biwifi.log
	wifi-main/src/main/java/com/jyzn/wifi/dao/account/UserDao.java
	wifi-main/src/main/java/com/jyzn/wifi/service/account/AccountManager.java
	wifi-main/src/main/java/com/jyzn/wifi/web/SystemCommonController.java
	wifi-main/src/test/java/com/jyzn/wifi/test/manager/account/UserDaoTest.java