Messages added
Merge branch 'Messages'
NO ZIP!!!