Merge Master and CodeFirst branches