updated project definition files
Merge branch 'master' of https://github.com/dezGusty/serpents-rpc

Conflicts:
	CMakeLists.txt
	serpents-rpc/CMakeLists.txt
Merge branch 'master' of https://github.com/dezGusty/serpents-rpc