updating plugins loaded function
Merge branch 'master' of https://github.com/inboundnow/landing-pages

Conflicts:
	functions/functions.global.php
fixing edit js
Merge branch 'master' of https://github.com/inboundnow/landing-pages

Conflicts:
	functions/functions.global.php