ADDED: message type to conversation query
Merge branch '1.3.0-dev' of github.com:tinfoilhat/tinfoil-sms into 1.3.0-dev