better sizing for annotation popups see MapStory/mapstory/issues/885
Merge branch 'master' of github.com:MapStory/mapstory into integration