Fixed #283
Update src/main/webapp/css/tatami.css
Merge pull request #302 from ptemplier/patch-2

Update src/main/webapp/css/tatami.css
Fixed #300
Fixed #291
Merge branch 'master' of github.com:ippontech/tatami

* 'master' of github.com:ippontech/tatami:
  Update src/main/webapp/css/tatami.css
Fixed #301
Fixed #301
Version 2.0.0.alpha.3
Fixed #286
Add markdown to html conversion to rss feed

* using pegdown
Convertion of mentionis and tag to html links in rss stream

* the regexp are converted from tatami customized marked.js
Merge remote-tracking branch 'origin/master' into rssMarkdown2Html

Conflicts:
	src/main/java/fr/ippon/tatami/web/syndic/SyndicView.java
Merge pull request #303 from PierreRust/rssMarkdown2Html

Rss markdown to html
Test correction LDAP
Corrected rssUid
Corrected bug when an attachement is deleted
non-existing files return a 404 error
better ETag management
Merge pull request #304 from hellsingblack/master

fix bug #287