Merge pull request #81 from bennychow/master

Fix bad merge
[BACKLOG-1620] - category should have been dimension
Merge pull request #82 from kurtwalker/BACKLOG-1620

[BACKLOG-1620] - category should have been dimension
[BACKLOG-1657] Allow class type inspection of property names
[BACKLOG-1657] Helper methods for Model Annotation Enum types
[BACKLOG-1657] Fix Checkstyle errors
Merge pull request #83 from bytekast/BACKLOG-1657

[BACKLOG-1657] Allow class type inspection of property names
[BACKLOG-1657] Allow use to pick from list of AggregationTypes, TimeTypes, GeoTypes, etc.
Merge pull request #84 from bytekast/BACKLOG-1657

[BACKLOG-1657] Allow use to pick from list of AggregationTypes, TimeTypes, GeoTypes, etc.
[BACKLOG-1768] Support for model changes starting with a hierarchy or measure instead of just field.