#6 add cids-parent to the pom
#6 jalopy changes
Merge branch 'feature/6-add-cids-parent' into dev