Ran php-cs-fixer with the new config
Merge branch 'master' into dev-form

Conflicts:
	module/ApiBundle/Controller/Admin/KeyController.php
	module/ApiBundle/Form/Admin/Key/Add.php
	module/ApiBundle/Form/Admin/Key/Edit.php
	module/BannerBundle/Controller/Admin/BannerController.php
	module/BannerBundle/Form/Admin/Banner/Add.php
	module/BannerBundle/Form/Admin/Banner/Edit.php
	module/BrBundle/Form/Admin/Company/Logo.php
	module/BrBundle/Form/Admin/Company/Logo/Add.php
	module/BrBundle/Form/Admin/Product/Add.php
	module/BrBundle/Form/Cv/Add.php
	module/CalendarBundle/Component/Validator/Name.php
	module/CalendarBundle/Controller/Admin/CalendarController.php
	module/CalendarBundle/Form/Admin/Event/Add.php
	module/CalendarBundle/Form/Admin/Event/Edit.php
	module/CalendarBundle/Form/Admin/Event/Poster.php
	module/CommonBundle/Command/AllInstall.php
	module/CommonBundle/Command/Install.php
	module/CommonBundle/Component/Console/Command.php
	module/CommonBundle/Component/Console/Command/Install.php
	module/CommonBundle/Component/Controller/ActionController.php
	module/CommonBundle/Component/Controller/ActionController/AdminController.php
	module/CommonBundle/Component/Form/Admin/Form.php
	module/CommonBundle/Component/Form/Bootstrap/Form.php
	module/CommonBundle/Controller/AccountController.php
	module/CommonBundle/Controller/Admin/AcademicController.php
	module/CommonBundle/Controller/Admin/AuthController.php
	module/CommonBundle/Controller/Admin/ConfigController.php
	module/CommonBundle/Controller/Admin/LocationController.php
	module/CommonBundle/Controller/Admin/RoleController.php
	module/CommonBundle/Controller/AuthController.php
	module/CommonBundle/Entity/User/Person.php
	module/CommonBundle/Form/Account/Activate.php
	module/CommonBundle/Form/Account/Edit.php
	module/CommonBundle/Form/Account/Profile.php
	module/CommonBundle/Form/Address/Add.php
	module/CommonBundle/Form/Address/AddPrimary.php
	module/CommonBundle/Form/Admin/Academic/Add.php
	module/CommonBundle/Form/Admin/Academic/Edit.php
	module/CommonBundle/Form/Admin/Address/Add.php
	module/CommonBundle/Form/Admin/Address/AddPrimary.php
	module/CommonBundle/Form/Admin/Config/Edit.php
	module/CommonBundle/Form/Admin/Location/Add.php
	module/CommonBundle/Form/Admin/Location/Edit.php
	module/CommonBundle/Form/Admin/Person/Add.php
	module/CommonBundle/Form/Admin/Person/Edit.php
	module/CommonBundle/Form/Admin/Role/Add.php
	module/CommonBundle/Form/Admin/Role/Edit.php
	module/CommonBundle/Form/Admin/Unit/Add.php
	module/CommonBundle/Form/Admin/Unit/Edit.php
	module/CommonBundle/Form/Admin/Unit/Member.php
	module/CommonBundle/Form/Auth/Login.php
	module/CudiBundle/Command/Install.php
	module/CudiBundle/Component/Controller/ProfController.php
	module/CudiBundle/Controller/Prof/AuthController.php
	module/CudiBundle/Controller/Sale/AuthController.php
	module/CudiBundle/Form/Admin/Mail/Send.php
	module/CudiBundle/Form/Admin/Prof/Article/Confirm.php
	module/CudiBundle/Form/Admin/Sales/Article/Mail.php
	module/CudiBundle/Form/Admin/Sales/Article/Restrictions/Add.php
	module/CudiBundle/Form/Admin/Sales/Session/Add.php
	module/CudiBundle/Form/Admin/Sales/Session/OpeningHour/Add.php
	module/CudiBundle/Form/Admin/SpecialActions/Irreeel/Assign.php
	module/CudiBundle/Form/Admin/Stock/SelectOptions.php
	module/CudiBundle/Form/Admin/Supplier/Add.php
	module/CudiBundle/Form/Prof/Article/Add.php
	module/CudiBundle/Form/Prof/Article/Edit.php
	module/CudiBundle/Form/Prof/Comment/Add.php
	module/CudiBundle/Form/Prof/Comment/Reply.php
	module/CudiBundle/Form/Prof/File/Add.php
	module/CudiBundle/Form/Sale/Queue/SignIn.php
	module/DoorBundle/Form/Admin/Rule/Add.php
	module/DoorBundle/Form/Admin/Rule/Edit.php
	module/FormBundle/Controller/Manage/AuthController.php
	module/FormBundle/Form/Admin/Field/Add.php
	module/FormBundle/Form/Admin/Form/Add.php
	module/FormBundle/Form/Admin/Group/Add.php
	module/FormBundle/Form/Admin/Viewer/Add.php
	module/FormBundle/Form/Manage/SpecifiedForm/Add.php
	module/FormBundle/Form/Manage/SpecifiedForm/Doodle.php
	module/FormBundle/Form/SpecifiedForm/Add.php
	module/GalleryBundle/Form/Admin/Album/Add.php
	module/LogisticsBundle/Command/Install.php
	module/LogisticsBundle/Controller/AuthController.php
	module/LogisticsBundle/Controller/IndexController.php
	module/LogisticsBundle/Controller/LeaseController.php
	module/LogisticsBundle/Form/Admin/Driver/Add.php
	module/LogisticsBundle/Form/Admin/PianoReservation/Add.php
	module/LogisticsBundle/Form/Admin/VanReservation/Add.php
	module/LogisticsBundle/Form/Lease/AddLease.php
	module/LogisticsBundle/Form/Lease/AddReturn.php
	module/LogisticsBundle/Form/PianoReservation/Add.php
	module/LogisticsBundle/Form/VanReservation/Add.php
	module/LogisticsBundle/Form/VanReservation/Edit.php
	module/MailBundle/Controller/Admin/BakskeController.php
	module/MailBundle/Controller/Admin/MailingListController.php
	module/MailBundle/Controller/Admin/ProfController.php
	module/MailBundle/Controller/Admin/StudyController.php
	module/MailBundle/Form/Admin/Alias/Add.php
	module/MailBundle/Form/Admin/Bakske/Mail.php
	module/MailBundle/Form/Admin/Cudi/Mail.php
	module/MailBundle/Form/Admin/Group/Mail.php
	module/MailBundle/Form/Admin/Mail/Mail.php
	module/MailBundle/Form/Admin/MailingList/Add.php
	module/MailBundle/Form/Admin/MailingList/Admin.php
	module/MailBundle/Form/Admin/MailingList/AdminRole.php
	module/MailBundle/Form/Admin/MailingList/Entry/MailingList.php
	module/MailBundle/Form/Admin/MailingList/Entry/Person/Academic.php
	module/MailBundle/Form/Admin/MailingList/Entry/Person/External.php
	module/MailBundle/Form/Admin/Message/Edit.php
	module/MailBundle/Form/Admin/Promotion/Mail.php
	module/MailBundle/Form/Admin/Study/Mail.php
	module/MailBundle/Form/Admin/Volunteer/Mail.php
	module/NewsBundle/Controller/Admin/NewsController.php
	module/NewsBundle/Form/Admin/News/Add.php
	module/NotificationBundle/Controller/Admin/NotificationController.php
	module/NotificationBundle/Form/Admin/Notification/Add.php
	module/OnBundle/Controller/Admin/SlugController.php
	module/OnBundle/Form/Admin/Slug/Add.php
	module/OnBundle/Form/Admin/Slug/Edit.php
	module/PageBundle/Controller/Admin/PageController.php
	module/PageBundle/Form/Admin/Category/Add.php
	module/PageBundle/Form/Admin/Category/Edit.php
	module/PageBundle/Form/Admin/Link/Add.php
	module/PageBundle/Form/Admin/Page/Add.php
	module/PageBundle/Form/Admin/Page/Edit.php
	module/PublicationBundle/Controller/Admin/Edition/HtmlController.php
	module/PublicationBundle/Controller/Admin/Edition/PdfController.php
	module/PublicationBundle/Controller/Admin/PublicationController.php
	module/PublicationBundle/Form/Admin/Edition/Html/Add.php
	module/PublicationBundle/Form/Admin/Edition/Pdf/Add.php
	module/PublicationBundle/Form/Admin/Publication/Add.php
	module/PublicationBundle/Form/Admin/Publication/Edit.php
	module/QuizBundle/Entity/Point.php
	module/QuizBundle/Entity/Quiz.php
	module/QuizBundle/Entity/Round.php
	module/QuizBundle/Entity/Team.php
	module/QuizBundle/Form/Admin/Quiz/Add.php
	module/QuizBundle/Form/Admin/Round/Add.php
	module/QuizBundle/Form/Admin/Round/Edit.php
	module/QuizBundle/Form/Admin/Team/Add.php
	module/QuizBundle/Form/Admin/Team/Edit.php
	module/SecretaryBundle/Component/Controller/RegistrationController.php
	module/SecretaryBundle/Controller/RegistrationController.php
	module/SecretaryBundle/Entity/Organization/MetaData.php
	module/SecretaryBundle/Form/Admin/Promotion/Add.php
	module/SecretaryBundle/Form/Admin/Registration/Add.php
	module/SecretaryBundle/Form/Admin/Registration/Barcode.php
	module/SecretaryBundle/Form/Admin/Registration/Edit.php
	module/SecretaryBundle/Form/Registration/Add.php
	module/SecretaryBundle/Form/Registration/Edit.php
	module/SecretaryBundle/Form/Registration/Subject/Add.php
	module/SecretaryBundle/Resources/config/install/acl.config.php
	module/ShiftBundle/Controller/Admin/SubscriptionController.php
	module/ShiftBundle/Form/Admin/Shift/Add.php
	module/ShiftBundle/Form/Admin/Shift/Edit.php
	module/ShiftBundle/Form/Admin/Subscription/Add.php
	module/ShiftBundle/Form/Shift/Search/Date.php
	module/ShiftBundle/Form/Shift/Search/Event.php
	module/ShiftBundle/Form/Shift/Search/Unit.php
	module/SportBundle/Command/Install.php
	module/SportBundle/Controller/Run/GroupController.php
	module/SportBundle/Form/Admin/Runner/Edit.php
	module/SportBundle/Form/Group/Add.php
	module/SportBundle/Form/Queue/Add.php
	module/SyllabusBundle/Controller/Admin/AcademicController.php
	module/SyllabusBundle/Controller/Admin/SubjectController.php
	module/SyllabusBundle/Form/Admin/Academic/Study/Add.php
	module/SyllabusBundle/Form/Admin/Academic/Subject/Add.php
	module/SyllabusBundle/Form/Admin/Group/Add.php
	module/SyllabusBundle/Form/Admin/Group/Edit.php
	module/SyllabusBundle/Form/Admin/Group/Study/Add.php
	module/SyllabusBundle/Form/Admin/Prof/Add.php
	module/SyllabusBundle/Form/Admin/Study/Add.php
	module/SyllabusBundle/Form/Admin/Study/Edit.php
	module/SyllabusBundle/Form/Admin/Subject/Add.php
	module/SyllabusBundle/Form/Admin/Subject/Comment/Add.php
	module/SyllabusBundle/Form/Admin/Subject/Comment/MarkAsRead.php
	module/SyllabusBundle/Form/Admin/Subject/Edit.php
	module/SyllabusBundle/Form/Admin/Subject/Reply/Add.php
	module/SyllabusBundle/Form/Admin/Subject/Study/Add.php
	module/SyllabusBundle/Form/Admin/Subject/Study/Edit.php
	module/TicketBundle/Controller/Admin/EventController.php
	module/TicketBundle/Form/Admin/Event/Add.php
	module/TicketBundle/Form/Admin/Event/Option.php
	module/TicketBundle/Form/Sale/Ticket/Add.php
	module/TicketBundle/Form/Ticket/Book.php
	module/WikiBundle/Controller/AuthController.php