added statistics method to ehcache
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
added function to set html/text body from template
reset
organized imports
removed methods for mail templates
Merge pull request #246 from svenkubiak/develop

Organized imports in ninja-core