ProfitPlatform / EventFlow friday's commit
Some minor fixes for EventFlow to work
Merge from EventFlow Profitware repository
Merge from EventFlow Profitware repository - templates