added merging prototypes
Merge branch 'master' of github.com:bcdev/oc-cci