WINDUP-146: Expose generic services via GraphContext.getService(Model.class)
Merge pull request #149 from jsight/WINDUP-143

WINDUP-143: Make the navigationbar in freemarker reports dynamic
Merge pull request #150 from jsight/WINDUP-146

WINDUP-146: Expose generic services via GraphContext.getService(Model.cl...
Merge from upstream/master