Prototype 2 - Microphone and prewritten text added as additional inputs.
Merge branch 'develop' of https://github.com/martinemil/Context-Aware-Mobile-Messaging into develop