[XV] Added json merge
Merge branch 'master' of github.com:Leadrush/opswork

Conflicts:
	supervisord/templates/default/quickfire.supervisord.conf.erb