Moved intertwine_sync to the features dir.
Changed pakage assignment on three features.
Another round of removing conflicts in features.
moved intertwine_layout_2012 and intertwine_layout_2012 into modules/features/.
moved intertwine_layout_2012 and intertwine_layout_2012 into modules/features/.
Removed unused files in features/intertwine_views/.