add legend icon 1 pixel up as requested by @sshyu
Merge branch 'master' of https://github.com/MapStory/mapstory
upload - fix selectors breaking on chrome 30
Merge branch 'master' into integration