fix array key search
key exist check fixed
Site Properties
added properties for modal site editor
Merge master