Bundle i entity usuari creats
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	app/.htaccess
	app/AppKernel.php
	app/bootstrap.php.cache
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.php.meta
	app/cache/dev/appDevDebugProjectContainer.xml
	app/cache/dev/appDevDebugProjectContainerCompiler.log
	app/cache/dev/appDevUrlGenerator.php
	app/cache/dev/appDevUrlGenerator.php.meta
	app/cache/dev/appDevUrlMatcher.php
	app/cache/dev/appDevUrlMatcher.php.meta
	app/cache/dev/classes.php
	app/cache/dev/twig/12/4d/f3eb4017ac6aa8d6576ebf95f6723f8a57b8fe135b51d1cc9dd5c03e8614.php
	app/cache/dev/twig/40/9f/e602f1e73010e7b29e7795758de871112fb544c040b70f5f127eb35e6793.php
	app/cache/dev/twig/47/28/73cc170550f466c0617dba8afb19ff5663bc9bcbf79055565b0f341b1460.php
	app/cache/dev/twig/5d/a8/cc9713ad296be2948349cd1770aba5eb1cfd001ab5a97dabd47907224f2a.php
	app/cache/dev/twig/ba/97/14cc641037fa2637955323f18111b5555c15517f5b6429182e54ac87bcf6.php
	app/cache/dev/twig/bf/10/94f6b58498f53dc12cebe446aaa95cc05e3540a5e7ba61113a932c628b6e.php
	app/cache/dev/twig/dd/9b/b38f24f78e12b2e765f77e5a60e8d446745c338ee77de18000a6fca8cf4f.php
	app/cache/prod/appProdProjectContainer.php
	app/cache/prod/appProdUrlMatcher.php
	app/cache/prod/twig/98/f5/08024f51b11b6b5a597798eaae70a858abdbd921df5e9b0eb7e909aee95c.php
	app/config/parameters.yml
	app/logs/dev.log
	app/logs/prod.log
	app/phpunit.xml.dist
	composer.lock
	src/.htaccess
	vendor/autoload.php
	vendor/composer/ClassLoader.php
	vendor/composer/autoload_files.php
	vendor/composer/autoload_namespaces.php
	vendor/composer/autoload_psr4.php
	vendor/composer/autoload_real.php
	vendor/composer/installed.json
	vendor/monolog/monolog/CHANGELOG.mdown
	vendor/monolog/monolog/README.mdown
	vendor/monolog/monolog/composer.json
	vendor/monolog/monolog/doc/extending.md
	vendor/monolog/monolog/doc/usage.md
	vendor/monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php
	vendor/monolog/monolog/src/Monolog/Formatter/JsonFormatter.php
	vendor/monolog/monolog/src/Monolog/Formatter/LineFormatter.php
	vendor/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php
	vendor/monolog/monolog/src/Monolog/Formatter/ScalarFormatter.php
	vendor/monolog/monolog/src/Monolog/Handler/AbstractHandler.php
	vendor/monolog/monolog/src/Monolog/Handler/CubeHandler.php
	vendor/monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php
	vendor/monolog/monolog/src/Monolog/Handler/ElasticSearchHandler.php
	vendor/monolog/monolog/src/Monolog/Handler/GelfHandler.php
	vendor/monolog/monolog/src/Monolog/Handler/HandlerInterface.php
	vendor/monolog/monolog/src/Monolog/Handler/HipChatHandler.php
	vendor/monolog/monolog/src/Monolog/Handler/LogglyHandler.php
	vendor/monolog/monolog/src/Monolog/Handler/NativeMailerHandler.php
	vendor/monolog/monolog/src/Monolog/Handler/PushoverHandler.php
	vendor/monolog/monolog/src/Monolog/Handler/RavenHandler.php
	vendor/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php
	vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php
	vendor/monolog/monolog/src/Monolog/Logger.php
	vendor/monolog/monolog/src/Monolog/Processor/IntrospectionProcessor.php
	vendor/swiftmailer/swiftmailer/.travis.yml
	vendor/swiftmailer/swiftmailer/VERSION
	vendor/swiftmailer/swiftmailer/doc/headers.rst
	vendor/swiftmailer/swiftmailer/doc/help-resources.rst
	vendor/swiftmailer/swiftmailer/doc/installing.rst
	vendor/swiftmailer/swiftmailer/doc/messages.rst
	vendor/swiftmailer/swiftmailer/doc/plugins.rst
	vendor/swiftmailer/swiftmailer/doc/sending.rst
	vendor/swiftmailer/swiftmailer/lib/classes/Swift/Message.php
	vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
	vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
	vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php
	vendor/swiftmailer/swiftmailer/lib/classes/Swift/SignedMessage.php
	vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/BodySigner.php
	vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
	vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
	vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php
	vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
	vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
	vendor/swiftmailer/swiftmailer/lib/dependency_maps/transport_deps.php
	vendor/swiftmailer/swiftmailer/lib/mime_types.php
	vendor/swiftmailer/swiftmailer/lib/swift_required.php
	vendor/swiftmailer/swiftmailer/lib/swift_required_pear.php
	vendor/symfony/icu/Symfony/Component/Icu/IcuCurrencyBundle.php
	vendor/symfony/icu/Symfony/Component/Icu/IcuData.php
	vendor/symfony/icu/Symfony/Component/Icu/IcuLanguageBundle.php
	vendor/symfony/icu/Symfony/Component/Icu/IcuLocaleBundle.php
	vendor/symfony/icu/Symfony/Component/Icu/IcuRegionBundle.php
	vendor/symfony/icu/Symfony/Component/Icu/README.md
	vendor/symfony/icu/Symfony/Component/Icu/Resources/data/version.txt
	vendor/symfony/icu/Symfony/Component/Icu/Tests/IcuIntegrationTest.php
	vendor/symfony/icu/Symfony/Component/Icu/composer.json
	vendor/symfony/monolog-bundle/Symfony/Bundle/MonologBundle/DependencyInjection/MonologExtension.php
	vendor/symfony/monolog-bundle/Symfony/Bundle/MonologBundle/MonologBundle.php
	vendor/symfony/swiftmailer-bundle/Symfony/Bundle/SwiftmailerBundle/Command/DebugCommand.php
	vendor/symfony/swiftmailer-bundle/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/Configuration.php
	vendor/symfony/swiftmailer-bundle/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php
	vendor/symfony/swiftmailer-bundle/Symfony/Bundle/SwiftmailerBundle/EventListener/EmailSenderListener.php
	vendor/symfony/swiftmailer-bundle/Symfony/Bundle/SwiftmailerBundle/Resources/config/swiftmailer.xml
	vendor/symfony/swiftmailer-bundle/Symfony/Bundle/SwiftmailerBundle/Resources/meta/LICENSE
	vendor/symfony/swiftmailer-bundle/Symfony/Bundle/SwiftmailerBundle/composer.json
	vendor/symfony/symfony/.travis.yml
	vendor/symfony/symfony/CHANGELOG-2.3.md
	vendor/symfony/symfony/CHANGELOG-2.4.md
	vendor/symfony/symfony/CONTRIBUTORS.md
	vendor/symfony/symfony/LICENSE
	vendor/symfony/symfony/src/Symfony/Bridge/Propel1/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php
	vendor/symfony/symfony/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
	vendor/symfony/symfony/src/Symfony/Bridge/Twig/composer.json
	vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
	vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
	vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
	vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CompilerDebugDumpPass.php
	vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ContainerBuilderDebugDumpPass.php
	vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
	vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php
	vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/TemplateFinderTest.php
	vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
	vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php
	vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Compiler/TwigLoaderPassTest.php
	vendor/symfony/symfony/src/Symfony/Component/BrowserKit/Client.php
	vendor/symfony/symfony/src/Symfony/Component/BrowserKit/Cookie.php
	vendor/symfony/symfony/src/Symfony/Component/BrowserKit/Tests/ClientTest.php
	vendor/symfony/symfony/src/Symfony/Component/Config/ConfigCache.php
	vendor/symfony/symfony/src/Symfony/Component/Config/Loader/DelegatingLoader.php
	vendor/symfony/symfony/src/Symfony/Component/Config/Loader/FileLoader.php
	vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Definition/Builder/NodeBuilderTest.php
	vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Definition/Builder/TreeBuilderTest.php
	vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Loader/FileLoaderTest.php
	vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
	vendor/symfony/symfony/src/Symfony/Component/Config/Util/XmlUtils.php
	vendor/symfony/symfony/src/Symfony/Component/Console/Formatter/OutputFormatter.php
	vendor/symfony/symfony/src/Symfony/Component/Console/Tests/ApplicationTest.php
	vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3decorated.txt
	vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php
	vendor/symfony/symfony/src/Symfony/Component/CssSelector/Tests/Parser/ParserTest.php
	vendor/symfony/symfony/src/Symfony/Component/CssSelector/Tests/Parser/Shortcut/ClassParserTest.php
	vendor/symfony/symfony/src/Symfony/Component/CssSelector/Tests/Parser/Shortcut/ElementParserTest.php
	vendor/symfony/symfony/src/Symfony/Component/CssSelector/Tests/Parser/Shortcut/EmptyStringParserTest.php
	vendor/symfony/symfony/src/Symfony/Component/CssSelector/Tests/Parser/Shortcut/HashParserTest.php
	vendor/symfony/symfony/src/Symfony/Component/CssSelector/Tests/XPath/TranslatorTest.php
	vendor/symfony/symfony/src/Symfony/Component/Debug/ExceptionHandler.php
	vendor/symfony/symfony/src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php
	vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
	vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
	vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services4.yml
	vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
	vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
	vendor/symfony/symfony/src/Symfony/Component/DomCrawler/Crawler.php
	vendor/symfony/symfony/src/Symfony/Component/DomCrawler/Field/FormField.php
	vendor/symfony/symfony/src/Symfony/Component/DomCrawler/Form.php
	vendor/symfony/symfony/src/Symfony/Component/DomCrawler/Link.php
	vendor/symfony/symfony/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
	vendor/symfony/symfony/src/Symfony/Component/DomCrawler/Tests/FormTest.php
	vendor/symfony/symfony/src/Symfony/Component/DomCrawler/Tests/LinkTest.php
	vendor/symfony/symfony/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php
	vendor/symfony/symfony/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
	vendor/symfony/symfony/src/Symfony/Component/Filesystem/CHANGELOG.md
	vendor/symfony/symfony/src/Symfony/Component/Filesystem/Filesystem.php
	vendor/symfony/symfony/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
	vendor/symfony/symfony/src/Symfony/Component/Finder/Expression/Regex.php
	vendor/symfony/symfony/src/Symfony/Component/Finder/Tests/FinderTest.php
	vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/ChoiceList/ObjectChoiceList.php
	vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
	vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
	vendor/symfony/symfony/src/Symfony/Component/Form/Tests/CompoundFormTest.php
	vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php
	vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/File/UploadedFile.php
	vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Response.php
	vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
	vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php
	vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/SessionTest.php
	vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
	vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/composer.json
	vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
	vendor/symfony/symfony/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
	vendor/symfony/symfony/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
	vendor/symfony/symfony/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
	vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Kernel.php
	vendor/symfony/symfony/src/Symfony/Component/HttpKernel/KernelInterface.php
	vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Profiler/MemcacheProfilerStorage.php
	vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Profiler/MemcachedProfilerStorage.php
	vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Profiler/MongoDbProfilerStorage.php
	vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
	vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/ProfilerListenerTest.php
	vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php
	vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTestCase.php
	vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
	vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Profiler/MongoDbProfilerStorageTest.php
	vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/OptionsResolver.php
	vendor/symfony/symfony/src/Symfony/Component/Process/Process.php
	vendor/symfony/symfony/src/Symfony/Component/Process/ProcessPipes.php
	vendor/symfony/symfony/src/Symfony/Component/Process/ProcessUtils.php
	vendor/symfony/symfony/src/Symfony/Component/Process/Tests/AbstractProcessTest.php
	vendor/symfony/symfony/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php
	vendor/symfony/symfony/src/Symfony/Component/Process/Tests/ProcessUtilsTest.php
	vendor/symfony/symfony/src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php
	vendor/symfony/symfony/src/Symfony/Component/Process/Tests/SigchildEnabledProcessTest.php
	vendor/symfony/symfony/src/Symfony/Component/Process/Tests/SimpleProcessTest.php
	vendor/symfony/symfony/src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php
	vendor/symfony/symfony/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
	vendor/symfony/symfony/src/Symfony/Component/Security/Http/Firewall.php
	vendor/symfony/symfony/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
	vendor/symfony/symfony/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
	vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
	vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
	vendor/symfony/symfony/src/Symfony/Component/Translation/Loader/QtFileLoader.php
	vendor/symfony/symfony/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
	vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/Loader/QtFileLoaderTest.php
	vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
	vendor/symfony/symfony/src/Symfony/Component/Validator/ConstraintViolation.php
	vendor/symfony/symfony/src/Symfony/Component/Validator/Constraints/IbanValidator.php
	vendor/symfony/symfony/src/Symfony/Component/Validator/Constraints/UrlValidator.php
	vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/ConstraintViolationTest.php
	vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Constraints/IbanValidatorTest.php
	vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
	vendor/symfony/symfony/src/Symfony/Component/Yaml/Inline.php
	vendor/symfony/symfony/src/Symfony/Component/Yaml/Parser.php
	vendor/symfony/symfony/src/Symfony/Component/Yaml/Tests/DumperTest.php
	vendor/symfony/symfony/src/Symfony/Component/Yaml/Tests/ParserTest.php
	vendor/twig/twig/.travis.yml
	vendor/twig/twig/LICENSE
	vendor/twig/twig/composer.json
	vendor/twig/twig/ext/twig/php_twig.h
	vendor/twig/twig/ext/twig/twig.c
	vendor/twig/twig/lib/Twig/Autoloader.php
	vendor/twig/twig/lib/Twig/Compiler.php
	vendor/twig/twig/lib/Twig/Environment.php
	vendor/twig/twig/lib/Twig/ExpressionParser.php
	vendor/twig/twig/lib/Twig/Extension/Core.php
	vendor/twig/twig/lib/Twig/Lexer.php
	vendor/twig/twig/lib/Twig/Loader/Filesystem.php
	vendor/twig/twig/lib/Twig/Node/Expression/Call.php
	vendor/twig/twig/lib/Twig/Node/Module.php
	vendor/twig/twig/lib/Twig/Template.php
	vendor/twig/twig/lib/Twig/Token.php
	vendor/twig/twig/lib/Twig/TokenStream.php
	web/app.php