Update Marked
Accept html in markdown
Merge branch 'master' of github.com:ippontech/tatami

* 'master' of github.com:ippontech/tatami:
  refactoring js code
  Issue #380
  Issue #340
  Issue #374
  Revert "Added stress test documentation"
Merge pull request #388 from godu/master

Update Marked
version 2.0.1
corrected Jetty transitive dependencies
Update src/main/webapp/js/marked.js

Fix conflict between headings and hashtags (force having a space after hashes(#) to show text as heading)
Merge pull request #391 from ptemplier/patch-7

Update src/main/webapp/js/marked.js
Added back stress tests documentation that were deleted by mistake
Fix markdown header parsing
Issue #392 revert old version of language selection, partial resolve
fix Issue #394
Issue #396: fix typo, "accés" should be "accès".
Merge pull request #397 from adericbourg/master

Typo: "accés" should be "accès"
Merge pull request #398 from hellsingblack/master

fix bug #394
Merge branch 'master' of github.com:ippontech/tatami

* 'master' of github.com:ippontech/tatami:
  Issue #396: fix typo, "accés" should be "accès".
  fix Issue #394
  Issue #392 revert old version of language selection, partial resolve
  Added back stress tests documentation that were deleted by mistake
  Update src/main/webapp/js/marked.js
  corrected Jetty transitive dependencies
  version 2.0.1

Conflicts:
	src/main/webapp/js/marked.js
Marked : Disable html in markdown && add embedded dailymotion, youtube and vimeo videos.
Merge pull request #399 from godu/master

Marked update
Added TLS param to STMAP config
Merge pull request #404 from nippo/master

Tested with Gmail only