set max height on annotation popups see MapStory/mapstory/issues/885
follow up to 927345, forgot new template
Merge branch 'master' into integration
follow up to 927345, forgot new template
Merge branch 'master' into integration