Merge branch 'raysmond'
Merge branch 'raysmond'
Merge branch 'raysmond'
Merge branch 'raysmond'
Merge branch 'raysmond'
Merge branch 'raysmond'
change view page
Merge remote-tracking branch 'origin/master'
Merge branch 'raysmond'
Merge branch 'raysmond'
Merge branch 'raysmond'
Merge branch 'raysmond'
Merge branch 'raysmond'
update database model
Merge branch 'master' into raysmond