Merge pull request #17 from ArcBees/brandon_presenter17

Brandon presenter17
Merge pull request #18 from ArcBees/brandon_presenter18

Tuning and adding ContentSlotImport.
Working on NameTokens.