removed cisst folder (was used for merging)
fixed compilation errors due to merge