New config objects and creation in "mock" server response.
Merge branch 'master' of https://github.com/jadavis-rg/butterfly
Created config objects which support marsahlling from JSON.
Updates.
Added mediaelement files.
Some cleanup and relocation.
Merge in Jon's changes.
Merge branch 'master' of https://github.com/jadavis-rg/butterfly

Conflicts:
	.gitignore