solve icon merge question
album php
delete log
modify upload crop img
modify publish, wait server return
Merge branch 'master' of http://github.com/rabbitgo/work