added twilio demo. Fixed some model inconsistencies. Incremented version
remove mashups
remove twilio from pom
remove more twilio stuff
Merge branch 'develop'