Initial commit
Merge branch 'MessagingApp/master'