merged with develop
fixed some bugs in smart-content
pulled from develop
defined all variables in camel-case
merged conflicts
Merge pull request #207 from massiveart/feature/column-options

Feature/column options