Parcours de première connexion
Merge branch 'master' of github.com:ippontech/tatami

* 'master' of github.com:ippontech/tatami: (43 commits)
  fix bug issue #327
  Limited user suggestions size
  Corrected user suggestion algo
  Limit tag trends to 8 entries
  permittion application context
  Removed the "beta" warning, now that version 2.0 is nearly ready!
  Corrected the encoding, and some wordings
  refactoring file pagination
  refactoring file pagination
  Update src/main/java/fr/ippon/tatami/web/rest/AttachmentController.java
  Update src/main/java/fr/ippon/tatami/web/rest/FriendshipController.java
  file pagination
  external register
  Fix test broken by MailConfiguration
  templates and i18n for eamils
  feature #313
  fix Issue #313
  fix Issue #305
  Merge branch 'master', remote-tracking branch 'origin'
  2.0.0.beta.1 release
  ...

Conflicts:
	src/main/java/fr/ippon/tatami/service/MailService.java
	src/main/java/fr/ippon/tatami/web/rest/UserController.java
	src/main/webapp/WEB-INF/pages/account.jsp
	src/main/webapp/WEB-INF/pages/home.jsp
	src/main/webapp/WEB-INF/pages/profile.jsp
	src/main/webapp/css/tatami.css
Merge branch 'master' of github.com:ippontech/tatami

* 'master' of github.com:ippontech/tatami:
  Fix issues with chrome notifications (#244)
  Small refactoring of DigestService
  Add new cassandra column in migration script
  Change type data for attachment
  fix Issue #328
  fix bug progress bar quota user
  pagination attachment limited to 50
  Fix cron expression (do not specify year)
  Fix cron expression for digest emails
  Weekly digest mail templates en integration tests
  Integration tests and fixe for daily digest
  First intergation tests for email digest
  Mail digest Service implementation
  GUI and Rest controller for digest emails subscription
  Implementation of digest email subscription at service level
  Mail Digest Cassandra repository implementation and tests

Conflicts:
	src/main/java/fr/ippon/tatami/service/MailService.java
	src/main/resources/META-INF/tatami/mails/messages/messages_en.properties
	src/main/resources/META-INF/tatami/mails/messages/messages_fr.properties
Merge pull request #336 from godu/master

 Parcours de première connexion