Merge branch 'feature/bird1204'
j
131102

layout modify  by mafia
Merge branch 'master' into feature/bird1204