acitivity model findById method done
activity model complete
fixed merge issues
message model finished, with sort