Removed composer, fixed undefined vars in tree
Merge remote-tracking branch 'origin/master'

Conflicts:
	plugin/swifty-page-manager/swifty-page-manager.php