Updated assembly manifests
Resolved conflicts between master and dev