Merge branch 'ninefold_fix' into map_marker
Use less invasive means of setting normal icons higher than lower ones
Adjust cukes to account for all orgs now having a zindex
Adjust spec to anticipate json call on marker
Merge branch 'map_marker' into call_to_action