Merge branch 'master' of https://github.com/RomanGroup/BocattiSrv

# Conflicts:
#	json/BocattiSrvJSON.txt
