Added more comprehensiv profiler defaults
Merge branch 'develop' of git://github.com/oat-sa/generis into develop