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