Added messages
Merge branch 'develop' of https://github.com/martinemil/Context-Aware-Mobile-Messaging into develop

# By Martin Andersen
# Via Martin Andersen
* 'develop' of https://github.com/martinemil/Context-Aware-Mobile-Messaging:
  Footer with text-input added

Conflicts:
	stylesheets/main.css