睡觉了
哈哈
a
wishwall
Merge branch 'master' into JBLong

Conflicts:
	WishWall/application/css/universal.css
	WishWall/application/models/WishManager.php
Merge branch 'master' into JBLong
a
1.0
Merge branch 'JBLong'