[OE-3856] table versioning
[OE-3856] soft deletion
[OE-3856] migration consolidation
[OE-3856] removed unnecessary statements
[OE-3856] changed model inheritance to use the versioned base model
Merge branch 'develop' into feature/table-versioning
Merge branch 'release/1.5' into feature/table-versioning
[OE-3856] fixed double header
Merge branch 'develop' into feature/table-versioning

Conflicts:
	views/default/view.php
[OE-3914] fixed collation
fixed db references
[OE-3955] Added base JS unit tests
[OE-3955] Moved JS test files into tests dir; added connect grunt task for displaying the test runners (to allow for network operations in the tests)
Merge branch 'feature/jstests' into develop
Merge branch 'develop' into feature/table-versioning
Merge branch 'release/1.6' into develop
[OE-3971] fixed reference tables being named incorrectly.
removed orphaned version table
[OE-3987] table versioning changes
[OE-3987] bugfixes related to table versioning