Revert versioning
Squash bug introduced by Mr. Jonathan Davis, with extreme prejudice.
Merge branch 'phpdocs'
Merge branch 'issue/3077'
Merge branch 'feature/session-rewrites'
Merge branch 'feature/session-rewrites'
Merge branch 'feature/session-rewrites'
Merge branch 'okbk-patch-1'
Fix activation error key mismatch.
Revert "Fixed #2943 Correct subquery aggregation approach"

This reverts commit 6e2785ddfcb73545c12e573354f846a2e9c53b0c.
Merge branch 'feature/session-rewrites'
Merge branch 'issue/3085'
Merge branch 'issue/2983'
Merge branch 'issue/3084'
Merge branch 'issue/3084'
Merge branch 'issue/3086'
Merge branch 'issue/3053'
Fix for 1.3.x branch

See #3088
Merge branch 'Variations-API-fix-again' of https://github.com/crunnells/shopp into crunnells/pr/3090
Fixed versioning