Added meta-package for repo; updated package.xml files.
Resolved merge conflicts.