Changed session default lifetime
Merge pull request #305 from stefk/session-lifetime

Changed session default lifetime
Terms of Service
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Library/Configuration/PlatformConfiguration.php
	Library/Configuration/PlatformConfigurationHandler.php
Merge pull request #1 from ngodfraind/set-registration-mail-content

Set registration mail content
move home content entity
Doctrine Translation Extension.
move home content entity
Merge http://github.com/solispauwels/CoreBundle into set-registration-mail-content

Conflicts:
	Controller/Administration/ParametersController.php
	Library/Configuration/PlatformConfigurationHandler.php
	Resources/translations/platform.en.yml
	Resources/translations/platform.fr.yml
Merge http://github.com/solispauwels/CoreBundle into set-registration-mail-content

Conflicts:
	Entity/Home/Content.php
Fixing merge.