Began work on Messenger
Merge branch 'master' into marc
Development backup, client messages and sharing in place, still need to implement server.
Merged client stuff with master
Cleaing up