Support --baseFolder parameter and small data reorganization
Include missing model classes in api library (issue-184)
Prepare 1.2.1 release
Reset build identifiers for next release
Merge branch 'master' into enhancedLdap

# By James Moger
# Via James Moger
* master:
  Reset build identifiers for next release
  Prepare 1.2.1 release
  Include missing model classes in api library (issue-184)
  Support --baseFolder parameter and small data reorganization