Merge pull request #296 from ptemplier/master

Read message properties in UTF-8 in eclipse
Fixed #298
Merge branch 'master' of github.com:ippontech/tatami

* 'master' of github.com:ippontech/tatami:
  Read message properties in UTF-8 in eclipse
Merge branch 'master' of github.com:ippontech/tatami into merge

* 'master' of github.com:ippontech/tatami:
  Fixed #298

Conflicts:
	src/main/webapp/WEB-INF/pages/profile.jsp
Fix LDAP
Fixed #288
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
fix bug #287
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