IDI-104: Remove use of fluid.merge for adding items to static environment
Merge branch 'IDI-104' of github.com:acheetham/infusion-videoPlayer-wp-plugin into IDI-104

Conflicts:
	infusion_videoPlayer.php