Stored popup template with individual layers so that each search layer can have a unique template
Merge branch 'store_layer_specific_popup_template' into develop