add tag
bug fix
ajax doing now
done for tag
Merge branch 'master' into wenxinshi
tag edit done