merging front-end
Merge branch 'front-end'
activity model complete
fixed merge issues
message model finished, with sort
merged master