Fix issue introduced by merge conflict
WINDUP-143: Make the navigationbar in freemarker reports dynamic
WINDUP-146: Expose generic services via GraphContext.getService(Model.class)
WINDUP-151: Use Collections.singletonList() in Variables.setSingletonVariable()
Merged WINDUP-186
WINDUP-148: Change commit behavior to (optionally) commit after every rule execution (in GraphSubSet)
Merge pull request #153 from jsight/WINDUP-148

WINDUP-148: Change commit behavior to (optionally) commit after every ru...
WINDUP-138: Added a super small binary test (for quick test runs)
WINDUP-126: Improve sort order of application and file list in the application overview report
Merge pull request #158 from jsight/WINDUP-138

WINDUP-138: Add a small sized binary test app and move the groovy example blacklists to src/tests
Merge branch 'WINDUP-126' of https://github.com/jsight/windup into jsight-WINDUP-126
Merge branch 'jsight-WINDUP-126'
WINDUP-155: Create a way to queue in memory a VertexFrame-like object w/o immediately attaching it to the graph, as well as a fluent property setter API