[BACKLOG-1445] Extend interfaces to support inline modeling
[BACKLOG-1657] Display action description in UI, not enum name
Merge pull request #80 from bytekast/BACKLOG-1657

[BACKLOG-1657] Display action description in UI, not enum name
Merge branch 'master' of https://github.com/pentaho/modeler

Conflicts:
	src/org/pentaho/agilebi/modeler/models/annotations/AnnotationType.java
	src/org/pentaho/agilebi/modeler/models/annotations/CreateAttribute.java
	src/org/pentaho/agilebi/modeler/models/annotations/CreateMeasure.java
	src/org/pentaho/agilebi/modeler/models/annotations/ModelAnnotation.java
Merge pull request #77 from bennychow/master

[BACKLOG-1445] Extend interfaces to support inline modeling
[BACKLOG-1445] Fix bad merge
Merge branch 'master' of https://github.com/pentaho/modeler
Merge pull request #81 from bennychow/master

Fix bad merge