Starting refactor.
Cleaning up files.
More clean-up.
Merge branch 'feature/vigilantmedia-refactor' into development
Removing underscore in page header.
Merge branch 'release/2.1' into development