都说了没啥可说的
Merge branch 'master' into JBLong

Conflicts:
	WishWall/application/classes/Wish.php
	WishWall/application/controllers/welcome.php
	WishWall/application/models/WishManager.php
为啥
疯了
Merge branch 'master' into JBLong
最后一次了
Merge branch 'JBLong'