Fixed potential memory leak in RCC
Fixed merging issues
Merge branch 'zak' of https://github.com/mrsl/rone into zak

Conflicts:
	software/interfaces/RCC/bin/RCC.exe