Merge pull request #415 from bartcharbon/master

Added missing functions to MapperSecurityDecoratorGen.java.ftl
small change in property name
Merge branch 'master' of https://github.com/molgenis/molgenis