Changement droit fichiers

Changement droit fichiers
Message
>Test
Test
ajout repositories specifiques entities
Merge branch 'master' of github.com:JMartelot/IMIENetwork
Delete Competence.php~
Delete Conversation.php~
Retrait des fichiers d'historique générés par symfony.
Merge branch 'master' of github.com:JMartelot/IMIENetwork
Security Testings
Organisation de la structure du projet.

 ->Mise en place des repositories au bon endroit, + modifications des namespaces et classes impactées
->Création de la structure des managers

*note: des exemples ont été ajoutés au defaultController.
Merge branch 'master' into Testing

Conflicts:
	.gitignore
	src/ImieNetwork/SiteBundle/Entity/Competence.php
	src/ImieNetwork/SiteBundle/Entity/Competence.php~
	src/ImieNetwork/SiteBundle/Entity/Conversation.php
	src/ImieNetwork/SiteBundle/Entity/Conversation.php~
	src/ImieNetwork/SiteBundle/Entity/Conversationutilisateur.php
	src/ImieNetwork/SiteBundle/Entity/Conversationutilisateur.php~
	src/ImieNetwork/SiteBundle/Entity/Document.php
	src/ImieNetwork/SiteBundle/Entity/Document.php~
	src/ImieNetwork/SiteBundle/Entity/Documentmessage.php
	src/ImieNetwork/SiteBundle/Entity/Documentmessage.php~
	src/ImieNetwork/SiteBundle/Entity/Enquete.php
	src/ImieNetwork/SiteBundle/Entity/Enquete.php~
	src/ImieNetwork/SiteBundle/Entity/Evenement.php
	src/ImieNetwork/SiteBundle/Entity/Evenement.php~
	src/ImieNetwork/SiteBundle/Entity/Evenementutilisateur.php
	src/ImieNetwork/SiteBundle/Entity/Evenementutilisateur.php~
	src/ImieNetwork/SiteBundle/Entity/Experience.php
	src/ImieNetwork/SiteBundle/Entity/Experience.php~
	src/ImieNetwork/SiteBundle/Entity/Groupe.php
	src/ImieNetwork/SiteBundle/Entity/Groupe.php~
	src/ImieNetwork/SiteBundle/Entity/Groupemodule.php
	src/ImieNetwork/SiteBundle/Entity/Groupemodule.php~
	src/ImieNetwork/SiteBundle/Entity/Groupepropriete.php
	src/ImieNetwork/SiteBundle/Entity/Groupepropriete.php~
	src/ImieNetwork/SiteBundle/Entity/Groupeutilisateur.php
	src/ImieNetwork/SiteBundle/Entity/Groupeutilisateur.php~
	src/ImieNetwork/SiteBundle/Entity/Invitation.php
	src/ImieNetwork/SiteBundle/Entity/Invitation.php~
	src/ImieNetwork/SiteBundle/Entity/Message.php
	src/ImieNetwork/SiteBundle/Entity/Message.php~
	src/ImieNetwork/SiteBundle/Entity/Module.php
	src/ImieNetwork/SiteBundle/Entity/Module.php~
	src/ImieNetwork/SiteBundle/Entity/Offre.php
	src/ImieNetwork/SiteBundle/Entity/Offre.php~
	src/ImieNetwork/SiteBundle/Entity/Offrecomp.php
	src/ImieNetwork/SiteBundle/Entity/Offrecomp.php~
	src/ImieNetwork/SiteBundle/Entity/Offreville.php
	src/ImieNetwork/SiteBundle/Entity/Offreville.php~
	src/ImieNetwork/SiteBundle/Entity/Promotion.php
	src/ImieNetwork/SiteBundle/Entity/Promotion.php~
	src/ImieNetwork/SiteBundle/Entity/Proprieteetendue.php
	src/ImieNetwork/SiteBundle/Entity/Proprieteetendue.php~
	src/ImieNetwork/SiteBundle/Entity/Secteuractivite.php
	src/ImieNetwork/SiteBundle/Entity/Secteuractivite.php~
	src/ImieNetwork/SiteBundle/Entity/Typecontrat.php
	src/ImieNetwork/SiteBundle/Entity/Typecontrat.php~
	src/ImieNetwork/SiteBundle/Entity/Typemessage.php
	src/ImieNetwork/SiteBundle/Entity/Typemessage.php~
	src/ImieNetwork/SiteBundle/Entity/Utilisateur.php
	src/ImieNetwork/SiteBundle/Entity/Utilisateur.php~
	src/ImieNetwork/SiteBundle/Entity/Utilisateuractivite.php
	src/ImieNetwork/SiteBundle/Entity/Utilisateuractivite.php~
	src/ImieNetwork/SiteBundle/Entity/Utilisateurcompetence.php
	src/ImieNetwork/SiteBundle/Entity/Utilisateurcompetence.php~
	src/ImieNetwork/SiteBundle/Entity/Utilisateurpromotion.php
	src/ImieNetwork/SiteBundle/Entity/Utilisateurpromotion.php~
	src/ImieNetwork/SiteBundle/Entity/Utilisateurpropriete.php
	src/ImieNetwork/SiteBundle/Entity/Utilisateurpropriete.php~
	src/ImieNetwork/SiteBundle/Entity/Ville.php~
Ajout de la structure (repositories, managers) du master a la branche testing
Merge remote-tracking branch 'origin/Testing' into Testing