implement my activity edit
update activity icon upload UI
upload image for activity icon
update activity icon display
minor update
Merge remote-tracking branch 'Git_LM/master' into master1