Adding support for action type "json+files".
Merge branch 'master' of https://github.com/JornWildt/Mason

Conflicts:
	Client/ApiExplorer/ApiExplorer.csproj