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
fix issue #188

backslashes (\) and dollar signs ($) in the replacement string of
Matcher.appendReplacement need special handling
add changelog line and fix identation of updated libs
Added error message when no bodyparser for the content type was available
organized imports in all projects
Merge pull request #249 from svenkubiak/develop

organized imports in all projects
updated changelog.md
Merge pull request #250 from svenkubiak/develop

updated changelog.md
Added changelog.md entry
Added missing author to changelog.md entry
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'develop' of github.com:ninjaframework/ninja into issue-188

Conflicts:
	ninja-core/src/site/markdown/developer/changelog.md
add test cases for escaped constructs in route regex