Merge proposals dependent on lp://staging/~clioodlmanager/clioodlmanager/ClioCom_OdL_Manager-0.1

1. ClioCom_OdL_Manager-0.1
2. Dependent merge proposals