added back changes to site-edit
Merge pull request #694 from nZEDb/dev

added back changes to site-edit