CFY-1185 added method that loads json from a file or a string
CFY-1185 ue util method to load json
CFY-1185 added forgotten inputs
CFY-1185 fixed tests to allow for default type
Merge branch 'master' into CFY-1196-cli-refactor

Conflicts:
	cloudify_cli/commands/deployments.py
	cloudify_cli/config/parser_config.py
CFY-1196 executions.start to load json using utils method
CFY-1196 remove 'type' from inputs
Merge pull request #69 from cloudify-cosmo/CFY-1196-cli-refactor

Cfy 1196 cli refactor