add gd,modified msg loginc
simple merge dev
remove msg. ok
Merge branch 'dev'