Add missing synchronous call overload to json_connection
Merge pull request #30 from nathanhourt/phoenix

Add missing synchronous call overload to json_connection
Update .gitignore: ignore .cbp files (cmake artifact)

Conflicts:
	.gitignore
Merge branch 'master' of github.com:InvictusInnovations/fc

Conflicts:
	.gitignore