.DS_Store banished!
Fichier temporaire
Invitation amis + sauvgarde profil + derniers posts
Merge branch 'develop'

Conflicts:
	Backoffice/.settings/org.eclipse.core.resources.prefs
	Backoffice/app/Controller/FavorisController.php
	Backoffice/app/Controller/FriendsController.php
	Backoffice/app/Controller/PostsController.php
	Backoffice/app/Controller/ResponsesController.php
	Backoffice/app/Controller/UsersController.php
	Backoffice/app/tmp/cache/models/myapp_cake_model_default_mydb_mms_choices_posts
	Backoffice/app/tmp/cache/models/myapp_cake_model_default_mydb_mms_list
	Backoffice/app/tmp/cache/models/myapp_cake_model_default_mydb_mms_posts
	Backoffice/app/tmp/cache/models/myapp_cake_model_default_mydb_mms_users
	Backoffice/app/tmp/cache/persistent/myapp_cake_core_file_map
	Backoffice/app/tmp/cache/persistent/myapp_cake_core_method_cache
	Backoffice/app/tmp/cache/persistent/myapp_cake_core_object_map
	Backoffice/app/tmp/logs/error.log
	www/css/style.css
	www/js/config.js