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

Conflicts:
	stylesheets/main.css