use ConfigurableWroManagerFactory & googleClosure processor instead of jsMin to avoid script break after minimization
delete attachments
Merge pull request #284 from alexo/master

Use googleClosure for js minimization instead of jsMin
Merge pull request #285 from hellsingblack/master

Delete attachments
Merge branch 'master' of github.com:ippontech/tatami

* 'master' of github.com:ippontech/tatami:
  delete attachments
  use ConfigurableWroManagerFactory & googleClosure processor instead of jsMin to avoid script break after minimization

Conflicts:
	src/main/webapp/WEB-INF/pages/includes/templates-admin.jsp
Read message properties in UTF-8 in eclipse
Merge pull request #296 from ptemplier/master

Read message properties in UTF-8 in eclipse
Show @username when mouse is over the profile picture or id
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