Simplify code a bit
Make methods in FunctionBlock final
Regenerate model
Make Outputs functional
Fix NullPointerException in Activator
Merge commits from master into funcblock