fixed deploy message bouncing
fixed room history with saved system messages
Merge branch 'develop'