Merge https://github.com/geoffreysmith/sitecore-6.6-sample
Merge https://github.com/geoffreysmith/sitecore-6.6-sample