changes needed for MapStory/mapstory/issues/770
uploader- attribute selection is flat list, #548
Merge branch 'iss-549-time-attribute-list' into integration