a foolish commit, new a lot of models
modified activity UI
ask questions about a activity
edit the index page
activity show finished, with Q&A, and comment
Merge branch 'activity' into hapo
small fault accurated
actTag model new
solve the problem of show picture
temply, stop here, just a default tag image
conflict merged
small modify
merge alex to hapo
Merge branch 'alex' to local
Merge branch 'alex', again, small changes
merge alex into hapo again
UI changed a lot
merge hapo into dev
edit the layout of application
edit the layout of application