Merged upstream
Merge branch 'master' of git://github.com/jonbullock/JBake
Merge branch 'master' of git://github.com/jonbullock/JBake
update to newer jetty
Merge branch 'master' of git://github.com/jonbullock/JBake

Conflicts:
	README.md
Changed dependencies related to groovy templates to reduce distro size
parser is expects now standard property style
Fix #77 : support json object into header
Moved execution scripts to /bin folder, to facilitate distribution via
GVM.
Upgraded versions of Groovy, Thymeleaf & Freemarker.
[maven-release-plugin] prepare release v2.3.1
[maven-release-plugin] prepare for next development iteration
Removing leading and trailing blanks while parsing tags
Merge pull request #119 from pditommaso/mybranch

Removing leading and trailing blanks while parsing tags
Fix leakage
Merge pull request #124 from aldrinleal/fix-file-leaks

Fix leakage
extract max parsing millis into config
fixes #128 by making sure no null tag list could break the process
Update readme with new badges

The badges provided by shields.io look much more better than the default ones provided by Travis and Coveralls
Fixes #121