Add message adding dialog
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Uh, re-add the map centering/zooming thing