xiugai
Merge branch 'master' of github.com:WangTe/duikang

Conflicts:
	application/controllers/wm.php
修改session前缀
Merge branch 'master' of github.com:WangTe/duikang
修改数据库存储