Merge pull request #1 from droppedbars/development

Development
Merge pull request #2 from droppedbars/development

Version 1.2.0, supporting JSON imports properly, some refactoring.
Merge pull request #3 from droppedbars/development

May 5 Provided to Gliderline for customer demo
Rename htmlImportSettings.php to HtmlImportSettings.php
Merge pull request #17 from droppedbars/development

Development
Merge pull request #20 from droppedbars/development

Support for folders in flare imports and refactoring
Merge pull request #21 from droppedbars/development

Development
Merge pull request #24 from droppedbars/development

replace body tags with div
Merge pull request #30 from droppedbars/development

Refactoring back into master
Merge pull request #31 from droppedbars/development

indices can provide override for settings
Merge pull request #34 from droppedbars/development

Support mix of file sources and import types
Merge pull request #38 from droppedbars/development

Add in generic name and import from web support
Merge pull request #44 from droppedbars/master

baseline dev with master