modified:   app/config/app.php
	modified:   app/controllers/PostController.php
	modified:   app/controllers/backend/UserController.php
	modified:   app/routes.php
	modified:   app/views/backend/pages/user-all.blade.php
	modified:   composer.json
	modified:   composer.lock
	modified:   vendor/autoload.php
	modified:   vendor/composer/autoload_classmap.php
	modified:   vendor/composer/autoload_namespaces.php
	modified:   vendor/composer/autoload_psr4.php
	modified:   vendor/composer/autoload_real.php
	modified:   vendor/composer/installed.json
	deleted:    vendor/filp/whoops/.gitignore
	deleted:    vendor/filp/whoops/.scrutinizer.yml
	deleted:    vendor/filp/whoops/.travis.yml
	deleted:    vendor/filp/whoops/CONTRIBUTING.md
	deleted:    vendor/filp/whoops/README.md
	deleted:    vendor/filp/whoops/docs/API Documentation.md
	deleted:    vendor/filp/whoops/docs/Framework Integration.md
	deleted:    vendor/filp/whoops/docs/Open Files In An Editor.md
	deleted:    vendor/filp/whoops/examples/example-ajax-only.php
	deleted:    vendor/filp/whoops/examples/example-silex.php
	deleted:    vendor/filp/whoops/examples/example.php
	deleted:    vendor/filp/whoops/phpunit.xml.dist
	modified:   vendor/filp/whoops/src/Whoops/Exception/ErrorException.php
	modified:   vendor/filp/whoops/src/Whoops/Exception/Formatter.php
	modified:   vendor/filp/whoops/src/Whoops/Exception/Frame.php
	modified:   vendor/filp/whoops/src/Whoops/Exception/FrameCollection.php
	modified:   vendor/filp/whoops/src/Whoops/Exception/Inspector.php
	modified:   vendor/filp/whoops/src/Whoops/Handler/CallbackHandler.php
	modified:   vendor/filp/whoops/src/Whoops/Handler/Handler.php
	modified:   vendor/filp/whoops/src/Whoops/Handler/HandlerInterface.php
	modified:   vendor/filp/whoops/src/Whoops/Handler/JsonResponseHandler.php
	modified:   vendor/filp/whoops/src/Whoops/Handler/PlainTextHandler.php
	modified:   vendor/filp/whoops/src/Whoops/Handler/PrettyPageHandler.php
	modified:   vendor/filp/whoops/src/Whoops/Handler/SoapResponseHandler.php
	modified:   vendor/filp/whoops/src/Whoops/Handler/XmlResponseHandler.php
	modified:   vendor/filp/whoops/src/Whoops/Provider/Phalcon/WhoopsServiceProvider.php
	modified:   vendor/filp/whoops/src/Whoops/Provider/Silex/WhoopsServiceProvider.php
	modified:   vendor/filp/whoops/src/Whoops/Resources/views/env_details.html.php
	modified:   vendor/filp/whoops/src/Whoops/Resources/views/frame_code.html.php
	modified:   vendor/filp/whoops/src/Whoops/Resources/views/frame_list.html.php
	modified:   vendor/filp/whoops/src/Whoops/Resources/views/header.html.php
	modified:   vendor/filp/whoops/src/Whoops/Run.php
	modified:   vendor/filp/whoops/src/Whoops/Util/Misc.php
	modified:   vendor/filp/whoops/src/Whoops/Util/TemplateHelper.php
	modified:   vendor/filp/whoops/src/deprecated/Zend/ExceptionStrategy.php
	modified:   vendor/filp/whoops/src/deprecated/Zend/Module.php
	modified:   vendor/filp/whoops/src/deprecated/Zend/RouteNotFoundStrategy.php
	modified:   vendor/filp/whoops/src/deprecated/Zend/module.config.example.php
	deleted:    vendor/filp/whoops/tests/Whoops/Exception/FormatterTest.php
	deleted:    vendor/filp/whoops/tests/Whoops/Exception/FrameCollectionTest.php
	deleted:    vendor/filp/whoops/tests/Whoops/Exception/FrameTest.php
	deleted:    vendor/filp/whoops/tests/Whoops/Exception/InspectorTest.php
	deleted:    vendor/filp/whoops/tests/Whoops/Handler/JsonResponseHandlerTest.php
	deleted:    vendor/filp/whoops/tests/Whoops/Handler/PlainTextHandlerTest.php
	deleted:    vendor/filp/whoops/tests/Whoops/Handler/PrettyPageHandlerTest.php
	deleted:    vendor/filp/whoops/tests/Whoops/Handler/SoapResponseHandlerTest.php
	deleted:    vendor/filp/whoops/tests/Whoops/Handler/XmlResponseHandlerTest.php
	deleted:    vendor/filp/whoops/tests/Whoops/RunTest.php
	deleted:    vendor/filp/whoops/tests/Whoops/TestCase.php
	deleted:    vendor/filp/whoops/tests/Whoops/Util/MiscTest.php
	deleted:    vendor/filp/whoops/tests/Whoops/Util/TemplateHelperTest.php
	deleted:    vendor/filp/whoops/tests/bootstrap.php
	deleted:    vendor/filp/whoops/tests/deprecated/Zend/ModuleTest.php
	deleted:    vendor/filp/whoops/tests/fixtures/frame.lines-test.php
	deleted:    vendor/filp/whoops/tests/fixtures/template.php
	deleted:    vendor/ircmaxell/password-compat/.travis.yml
	deleted:    vendor/ircmaxell/password-compat/README.md
	modified:   vendor/ircmaxell/password-compat/composer.json
	modified:   vendor/ircmaxell/password-compat/lib/password.php
	deleted:    vendor/ircmaxell/password-compat/phpunit.xml.dist
	deleted:    vendor/ircmaxell/password-compat/test/Unit/PasswordGetInfoTest.php
	deleted:    vendor/ircmaxell/password-compat/test/Unit/PasswordHashTest.php
	deleted:    vendor/ircmaxell/password-compat/test/Unit/PasswordNeedsRehashTest.php
	deleted:    vendor/ircmaxell/password-compat/test/Unit/PasswordVerifyTest.php
	modified:   vendor/ircmaxell/password-compat/version-test.php
	modified:   vendor/patchwork/utf8/README.md
	modified:   vendor/patchwork/utf8/composer.json
	modified:   vendor/phpseclib/phpseclib/README.md
	modified:   vendor/phpseclib/phpseclib/phpseclib/File/ASN1.php
	modified:   vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger.php
	modified:   vendor/phpseclib/phpseclib/phpseclib/Net/SFTP.php
	modified:   vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php
	modified:   vendor/phpseclib/phpseclib/tests/Functional/Net/SFTPUserStoryTest.php
	modified:   vendor/phpseclib/phpseclib/tests/Unit/File/ASN1Test.php
	modified:   vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Client.php
	modified:   vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Cookie.php
	modified:   vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Response.php
	modified:   vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/ClientTest.php
	modified:   vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/ResponseTest.php
	modified:   vendor/symfony/class-loader/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
	modified:   vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassLoader.php
	modified:   vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassMapGenerator.php
	modified:   vendor/symfony/class-loader/Symfony/Component/ClassLoader/README.md
	modified:   vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php
	modified:   vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/ClassMapGeneratorTest.php
	modified:   vendor/symfony/class-loader/Symfony/Component/ClassLoader/UniversalClassLoader.php
	modified:   vendor/symfony/console/Symfony/Component/Console/Application.php
	modified:   vendor/symfony/console/Symfony/Component/Console/Command/HelpCommand.php
	modified:   vendor/symfony/console/Symfony/Component/Console/Command/ListCommand.php
	modified:   vendor/symfony/console/Symfony/Component/Console/ConsoleEvents.php
	modified:   vendor/symfony/console/Symfony/Component/Console/Descriptor/JsonDescriptor.php
	modified:   vendor/symfony/console/Symfony/Component/Console/Descriptor/TextDescriptor.php
	modified:   vendor/symfony/console/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
	modified:   vendor/symfony/console/Symfony/Component/Console/Helper/DescriptorHelper.php
	modified:   vendor/symfony/console/Symfony/Component/Console/Helper/ProgressBar.php
	modified:   vendor/symfony/console/Symfony/Component/Console/Helper/ProgressHelper.php
	modified:   vendor/symfony/console/Symfony/Component/Console/Input/InputArgument.php
	modified:   vendor/symfony/console/Symfony/Component/Console/Input/InputDefinition.php
	modified:   vendor/symfony/console/Symfony/Component/Console/Input/InputOption.php
	modified:   vendor/symfony/console/Symfony/Component/Console/Output/OutputInterface.php
	modified:   vendor/symfony/console/Symfony/Component/Console/README.md
	modified:   vendor/symfony/console/Symfony/Component/Console/Tests/ApplicationTest.php
	modified:   vendor/symfony/console/Symfony/Component/Console/Tests/Fixtures/application_1.json
	modified:   vendor/symfony/console/Symfony/Component/Console/Tests/Fixtures/application_1.md
	modified:   vendor/symfony/console/Symfony/Component/Console/Tests/Fixtures/application_1.txt
	modified:   vendor/symfony/console/Symfony/Component/Console/Tests/Fixtures/application_1.xml
	modified:   vendor/symfony/console/Symfony/Component/Console/Tests/Fixtures/application_2.json
	modified:   vendor/symfony/console/Symfony/Component/Console/Tests/Fixtures/application_2.md
	modified:   vendor/symfony/console/Symfony/Component/Console/Tests/Fixtures/application_2.txt
	modified:   vendor/symfony/console/Symfony/Component/Console/Tests/Fixtures/application_2.xml
	modified:   vendor/symfony/console/Symfony/Component/Console/Tests/Fixtures/application_astext1.txt
	modified:   vendor/symfony/console/Symfony/Component/Console/Tests/Fixtures/application_astext2.txt
	modified:   vendor/symfony/console/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
	modified:   vendor/symfony/console/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt
	modified:   vendor/symfony/console/Symfony/Component/Console/Tests/Fixtures/application_gethelp.txt
	modified:   vendor/symfony/console/Symfony/Component/Console/Tests/Fixtures/application_run1.txt
	modified:   vendor/symfony/console/Symfony/Component/Console/Tests/Fixtures/application_run2.txt
	modified:   vendor/symfony/console/Symfony/Component/Console/Tests/Fixtures/command_astext.txt
	modified:   vendor/symfony/console/Symfony/Component/Console/Tests/Fixtures/command_asxml.txt
	modified:   vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Token.php
	modified:   vendor/symfony/css-selector/Symfony/Component/CssSelector/README.md
	modified:   vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/AttributeMatchingExtension.php
	modified:   vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php
	modified:   vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/HtmlExtension.php
	modified:   vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php
	modified:   vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php
	modified:   vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Translator.php
	modified:   vendor/symfony/debug/Symfony/Component/Debug/ErrorHandler.php
	modified:   vendor/symfony/debug/Symfony/Component/Debug/Exception/FlattenException.php
	modified:   vendor/symfony/debug/Symfony/Component/Debug/ExceptionHandler.php
	modified:   vendor/symfony/debug/Symfony/Component/Debug/README.md
	modified:   vendor/symfony/debug/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php
	modified:   vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Crawler.php
	modified:   vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/README.md
	modified:   vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/FormTest.php
	modified:   vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
	modified:   vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/EventDispatcherInterface.php
	modified:   vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/README.md
	modified:   vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
	modified:   vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
	modified:   vendor/symfony/filesystem/Symfony/Component/Filesystem/Filesystem.php
	modified:   vendor/symfony/filesystem/Symfony/Component/Filesystem/README.md
	modified:   vendor/symfony/filesystem/Symfony/Component/Filesystem/Tests/FilesystemTest.php
	modified:   vendor/symfony/finder/Symfony/Component/Finder/Adapter/AbstractAdapter.php
	modified:   vendor/symfony/finder/Symfony/Component/Finder/Expression/Expression.php
	modified:   vendor/symfony/finder/Symfony/Component/Finder/Expression/Regex.php
	modified:   vendor/symfony/finder/Symfony/Component/Finder/Finder.php
	modified:   vendor/symfony/finder/Symfony/Component/Finder/Iterator/FilePathsIterator.php
	modified:   vendor/symfony/finder/Symfony/Component/Finder/Iterator/FileTypeFilterIterator.php
	modified:   vendor/symfony/finder/Symfony/Component/Finder/Iterator/PathFilterIterator.php
	modified:   vendor/symfony/finder/Symfony/Component/Finder/README.md
	modified:   vendor/symfony/finder/Symfony/Component/Finder/Shell/Shell.php
	modified:   vendor/symfony/finder/Symfony/Component/Finder/Tests/FinderTest.php
	modified:   vendor/symfony/finder/Symfony/Component/Finder/Tests/Iterator/FilecontentFilterIteratorTest.php
	modified:   vendor/symfony/finder/Symfony/Component/Finder/Tests/Iterator/MockSplFileInfo.php
	modified:   vendor/symfony/finder/Symfony/Component/Finder/Tests/Iterator/PathFilterIteratorTest.php
	modified:   vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/UploadedFile.php
	modified:   vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/FileBag.php
	modified:   vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/README.md
	modified:   vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/RedirectResponse.php
	modified:   vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Request.php
	modified:   vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Response.php
	modified:   vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
	modified:   vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
	modified:   vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSessionHandler.php
	modified:   vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
	modified:   vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/WriteCheckSessionHandler.php
	modified:   vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
	modified:   vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php
	modified:   vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php
	modified:   vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ApacheRequestTest.php
	modified:   vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/HeaderBagTest.php
	modified:   vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php
	modified:   vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/RequestTest.php
	modified:   vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
	modified:   vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
	modified:   vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
	modified:   vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php
	modified:   vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeSessionHandlerTest.php
	modified:   vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
	modified:   vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
	modified:   vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php
	modified:   vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
	modified:   vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Config/FileLocator.php
	modified:   vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
	modified:   vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php
	modified:   vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php
	modified:   vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
	modified:   vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php
	modified:   vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
	modified:   vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php
	modified:   vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
	modified:   vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Kernel.php
	modified:   vendor/symfony/http-kernel/Symfony/Component/HttpKernel/KernelEvents.php
	modified:   vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/BaseMemcacheProfilerStorage.php
	modified:   vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
	modified:   vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/PdoProfilerStorage.php
	modified:   vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php
	modified:   vendor/symfony/http-kernel/Symfony/Component/HttpKernel/README.md
	modified:   vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
	modified:   vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
	modified:   vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php
	modified:   vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/ProfilerListenerTest.php
	modified:   vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php
	modified:   vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php
	modified:   vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/TestMultipleHttpKernel.php
	modified:   vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/AbstractProfilerStorageTest.php
	modified:   vendor/symfony/process/Symfony/Component/Process/README.md
	modified:   vendor/symfony/process/Symfony/Component/Process/Tests/AbstractProcessTest.php
	modified:   vendor/symfony/routing/Symfony/Component/Routing/CHANGELOG.md
	modified:   vendor/symfony/routing/Symfony/Component/Routing/CompiledRoute.php
	modified:   vendor/symfony/routing/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php
	modified:   vendor/symfony/routing/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
	modified:   vendor/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
	modified:   vendor/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
	modified:   vendor/symfony/routing/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php
	modified:   vendor/symfony/routing/Symfony/Component/Routing/Matcher/UrlMatcher.php
	modified:   vendor/symfony/routing/Symfony/Component/Routing/README.md
	modified:   vendor/symfony/routing/Symfony/Component/Routing/RequestContext.php
	modified:   vendor/symfony/routing/Symfony/Component/Routing/Route.php
	modified:   vendor/symfony/routing/Symfony/Component/Routing/RouteCompiler.php
	modified:   vendor/symfony/routing/Symfony/Component/Routing/Router.php
	modified:   vendor/symfony/routing/Symfony/Component/Routing/Tests/Fixtures/RedirectableUrlMatcher.php
	modified:   vendor/symfony/routing/Symfony/Component/Routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php
	modified:   vendor/symfony/routing/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
	modified:   vendor/symfony/routing/Symfony/Component/Routing/Tests/RequestContextTest.php
	modified:   vendor/symfony/routing/Symfony/Component/Routing/Tests/RouteTest.php
	modified:   vendor/symfony/security-core/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
	modified:   vendor/symfony/security-core/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php
	modified:   vendor/symfony/security-core/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php
	modified:   vendor/symfony/security-core/Symfony/Component/Security/Core/Authorization/Voter/VoterInterface.php
	modified:   vendor/symfony/security-core/Symfony/Component/Security/Core/SecurityContextInterface.php
	modified:   vendor/symfony/security-core/Symfony/Component/Security/Core/Tests/Encoder/BCryptPasswordEncoderTest.php
	modified:   vendor/symfony/security-core/Symfony/Component/Security/Core/Util/SecureRandom.php
	modified:   vendor/symfony/translation/Symfony/Component/Translation/Catalogue/DiffOperation.php
	modified:   vendor/symfony/translation/Symfony/Component/Translation/Catalogue/MergeOperation.php
	modified:   vendor/symfony/translation/Symfony/Component/Translation/Dumper/MoFileDumper.php
	modified:   vendor/symfony/translation/Symfony/Component/Translation/Loader/CsvFileLoader.php
	modified:   vendor/symfony/translation/Symfony/Component/Translation/Loader/schema/dic/xliff-core/xml.xsd
	modified:   vendor/symfony/translation/Symfony/Component/Translation/README.md
	modified:   vendor/symfony/translation/Symfony/Component/Translation/Tests/Dumper/XliffFileDumperTest.php

 Untracked files:
   (use "git add <file>..." to include in what will be committed)

	app/config/packages/
	app/views/font/
	vendor/erusev/
	vendor/graham-campbell/
	vendor/phpseclib/phpseclib/CHANGELOG.md
	vendor/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/SaveSessionListener.php
	vendor/symfony/security-core/Symfony/Component/Security/Core/Resources/translations/security.az.xlf
	vendor/symfony/security-core/Symfony/Component/Security/Core/Resources/translations/security.he.xlf
 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch master
 Your branch and 'origin/master' have diverged,
 and have 1 and 3 different commits each, respectively.
   (use "git pull" to merge the remote branch into yours)

 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	new file:   app/config/packages/graham-campbell/markdown/config.php
	new file:   app/views/font/post.blade.php
	new file:   vendor/erusev/parsedown-extra/.travis.yml
	new file:   vendor/erusev/parsedown-extra/LICENSE.txt
	new file:   vendor/erusev/parsedown-extra/ParsedownExtra.php
	new file:   vendor/erusev/parsedown-extra/README.md
	new file:   vendor/erusev/parsedown-extra/composer.json
	new file:   vendor/erusev/parsedown-extra/phpunit.xml.dist
	new file:   vendor/erusev/parsedown-extra/test/ParsedownExtraTest.php
	new file:   vendor/erusev/parsedown-extra/test/bootstrap.php
	new file:   vendor/erusev/parsedown-extra/test/data/abbreviations.html
	new file:   vendor/erusev/parsedown-extra/test/data/abbreviations.md
	new file:   vendor/erusev/parsedown-extra/test/data/definition_lists.html
	new file:   vendor/erusev/parsedown-extra/test/data/definition_lists.md
	new file:   vendor/erusev/parsedown-extra/test/data/footnote.html
	new file:   vendor/erusev/parsedown-extra/test/data/footnote.md
	new file:   vendor/erusev/parsedown-extra/test/data/markdown_inside_markup.html
	new file:   vendor/erusev/parsedown-extra/test/data/markdown_inside_markup.md
	new file:   vendor/erusev/parsedown-extra/test/data/special_attributes.html
	new file:   vendor/erusev/parsedown-extra/test/data/special_attributes.md
	new file:   vendor/erusev/parsedown/.travis.yml
	new file:   vendor/erusev/parsedown/LICENSE.txt
	new file:   vendor/erusev/parsedown/Parsedown.php
	new file:   vendor/erusev/parsedown/README.md
	new file:   vendor/erusev/parsedown/composer.json
	new file:   vendor/erusev/parsedown/phpunit.xml.dist
	new file:   vendor/erusev/parsedown/test/ParsedownTest.php
	new file:   vendor/erusev/parsedown/test/bootstrap.php
	new file:   vendor/erusev/parsedown/test/data/aesthetic_table.html
	new file:   vendor/erusev/parsedown/test/data/aesthetic_table.md
	new file:   vendor/erusev/parsedown/test/data/aligned_table.html
	new file:   vendor/erusev/parsedown/test/data/aligned_table.md
	new file:   vendor/erusev/parsedown/test/data/atx_heading.html
	new file:   vendor/erusev/parsedown/test/data/atx_heading.md
	new file:   vendor/erusev/parsedown/test/data/automatic_link.html
	new file:   vendor/erusev/parsedown/test/data/automatic_link.md
	new file:   vendor/erusev/parsedown/test/data/block-level_html.html
	new file:   vendor/erusev/parsedown/test/data/block-level_html.md
	new file:   vendor/erusev/parsedown/test/data/code_block.html
	new file:   vendor/erusev/parsedown/test/data/code_block.md
	new file:   vendor/erusev/parsedown/test/data/code_span.html
	new file:   vendor/erusev/parsedown/test/data/code_span.md
	new file:   vendor/erusev/parsedown/test/data/compound_blockquote.html
	new file:   vendor/erusev/parsedown/test/data/compound_blockquote.md
	new file:   vendor/erusev/parsedown/test/data/compound_emphasis.html
	new file:   vendor/erusev/parsedown/test/data/compound_emphasis.md
	new file:   vendor/erusev/parsedown/test/data/compound_list.html
	new file:   vendor/erusev/parsedown/test/data/compound_list.md
	new file:   vendor/erusev/parsedown/test/data/deeply_nested_list.html
	new file:   vendor/erusev/parsedown/test/data/deeply_nested_list.md
	new file:   vendor/erusev/parsedown/test/data/em_strong.html
	new file:   vendor/erusev/parsedown/test/data/em_strong.md
	new file:   vendor/erusev/parsedown/test/data/email.html
	new file:   vendor/erusev/parsedown/test/data/email.md
	new file:   vendor/erusev/parsedown/test/data/emphasis.html
	new file:   vendor/erusev/parsedown/test/data/emphasis.md
	new file:   vendor/erusev/parsedown/test/data/escaping.html
	new file:   vendor/erusev/parsedown/test/data/escaping.md
	new file:   vendor/erusev/parsedown/test/data/fenced_code_block.html
	new file:   vendor/erusev/parsedown/test/data/fenced_code_block.md
	new file:   vendor/erusev/parsedown/test/data/horizontal_rule.html
	new file:   vendor/erusev/parsedown/test/data/horizontal_rule.md
	new file:   vendor/erusev/parsedown/test/data/html_comment.html
	new file:   vendor/erusev/parsedown/test/data/html_comment.md
	new file:   vendor/erusev/parsedown/test/data/html_entity.html
	new file:   vendor/erusev/parsedown/test/data/html_entity.md
	new file:   vendor/erusev/parsedown/test/data/image_reference.html
	new file:   vendor/erusev/parsedown/test/data/image_reference.md
	new file:   vendor/erusev/parsedown/test/data/image_title.html
	new file:   vendor/erusev/parsedown/test/data/image_title.md
	new file:   vendor/erusev/parsedown/test/data/implicit_reference.html
	new file:   vendor/erusev/parsedown/test/data/implicit_reference.md
	new file:   vendor/erusev/parsedown/test/data/inline_link.html
	new file:   vendor/erusev/parsedown/test/data/inline_link.md
	new file:   vendor/erusev/parsedown/test/data/inline_link_title.html
	new file:   vendor/erusev/parsedown/test/data/inline_link_title.md
	new file:   vendor/erusev/parsedown/test/data/inline_title.html
	new file:   vendor/erusev/parsedown/test/data/inline_title.md
	new file:   vendor/erusev/parsedown/test/data/lazy_blockquote.html
	new file:   vendor/erusev/parsedown/test/data/lazy_blockquote.md
	new file:   vendor/erusev/parsedown/test/data/lazy_list.html
	new file:   vendor/erusev/parsedown/test/data/lazy_list.md
	new file:   vendor/erusev/parsedown/test/data/line_break.html
	new file:   vendor/erusev/parsedown/test/data/line_break.md
	new file:   vendor/erusev/parsedown/test/data/multiline_list_paragraph.html
	new file:   vendor/erusev/parsedown/test/data/multiline_list_paragraph.md
	new file:   vendor/erusev/parsedown/test/data/nested_block-level_html.html
	new file:   vendor/erusev/parsedown/test/data/nested_block-level_html.md
	new file:   vendor/erusev/parsedown/test/data/ordered_list.html
	new file:   vendor/erusev/parsedown/test/data/ordered_list.md
	new file:   vendor/erusev/parsedown/test/data/paragraph_list.html
	new file:   vendor/erusev/parsedown/test/data/paragraph_list.md
	new file:   vendor/erusev/parsedown/test/data/reference_title.html
	new file:   vendor/erusev/parsedown/test/data/reference_title.md
	new file:   vendor/erusev/parsedown/test/data/self-closing_html.html
	new file:   vendor/erusev/parsedown/test/data/self-closing_html.md
	new file:   vendor/erusev/parsedown/test/data/separated_nested_list.html
	new file:   vendor/erusev/parsedown/test/data/separated_nested_list.md
	new file:   vendor/erusev/parsedown/test/data/setext_header.html
	new file:   vendor/erusev/parsedown/test/data/setext_header.md
	new file:   vendor/erusev/parsedown/test/data/simple_blockquote.html
	new file:   vendor/erusev/parsedown/test/data/simple_blockquote.md
	new file:   vendor/erusev/parsedown/test/data/simple_table.html
	new file:   vendor/erusev/parsedown/test/data/simple_table.md
	new file:   vendor/erusev/parsedown/test/data/span-level_html.html
	new file:   vendor/erusev/parsedown/test/data/span-level_html.md
	new file:   vendor/erusev/parsedown/test/data/sparse_dense_list.html
	new file:   vendor/erusev/parsedown/test/data/sparse_dense_list.md
	new file:   vendor/erusev/parsedown/test/data/sparse_html.html
	new file:   vendor/erusev/parsedown/test/data/sparse_html.md
	new file:   vendor/erusev/parsedown/test/data/sparse_list.html
	new file:   vendor/erusev/parsedown/test/data/sparse_list.md
	new file:   vendor/erusev/parsedown/test/data/special_characters.html
	new file:   vendor/erusev/parsedown/test/data/special_characters.md
	new file:   vendor/erusev/parsedown/test/data/strikethrough.html
	new file:   vendor/erusev/parsedown/test/data/strikethrough.md
	new file:   vendor/erusev/parsedown/test/data/strong_em.html
	new file:   vendor/erusev/parsedown/test/data/strong_em.md
	new file:   vendor/erusev/parsedown/test/data/tab-indented_code_block.html
	new file:   vendor/erusev/parsedown/test/data/tab-indented_code_block.md
	new file:   vendor/erusev/parsedown/test/data/table_inline_markdown.html
	new file:   vendor/erusev/parsedown/test/data/table_inline_markdown.md
	new file:   vendor/erusev/parsedown/test/data/text_reference.html
	new file:   vendor/erusev/parsedown/test/data/text_reference.md
	new file:   vendor/erusev/parsedown/test/data/unordered_list.html
	new file:   vendor/erusev/parsedown/test/data/unordered_list.md
	new file:   vendor/erusev/parsedown/test/data/untidy_table.html
	new file:   vendor/erusev/parsedown/test/data/untidy_table.md
	new file:   vendor/erusev/parsedown/test/data/url_autolinking.html
	new file:   vendor/erusev/parsedown/test/data/url_autolinking.md
	new file:   vendor/erusev/parsedown/test/data/whitespace.html
	new file:   vendor/erusev/parsedown/test/data/whitespace.md
	new file:   vendor/graham-campbell/markdown/LICENSE.md
	new file:   vendor/graham-campbell/markdown/composer.json
	new file:   vendor/graham-campbell/markdown/src/Engines/BladeMarkdownEngine.php
	new file:   vendor/graham-campbell/markdown/src/Engines/MarkdownEngine.php
	new file:   vendor/graham-campbell/markdown/src/Engines/PhpMarkdownEngine.php
	new file:   vendor/graham-campbell/markdown/src/Facades/Markdown.php
	new file:   vendor/graham-campbell/markdown/src/Markdown.php
	new file:   vendor/graham-campbell/markdown/src/MarkdownServiceProvider.php
	new file:   vendor/graham-campbell/markdown/src/config/config.php
	new file:   vendor/phpseclib/phpseclib/CHANGELOG.md
	new file:   vendor/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/SaveSessionListener.php
	new file:   vendor/symfony/security-core/Symfony/Component/Security/Core/Resources/translations/security.az.xlf
	new file:   vendor/symfony/security-core/Symfony/Component/Security/Core/Resources/translations/security.he.xlf
erge branch 'master' of https://github.com/notech/tzs

onflicts:
       app/config/app.php
       app/controllers/backend/UserController.php
       app/routes.php
       app/views/backend/pages/user-all.blade.php
       app/views/font/post.blade.php
       composer.json

 It looks like you may be committing a merge.
 If this is not correct, please remove the file
	.git/MERGE_HEAD
 and try again.

 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch master
 Your branch and 'origin/master' have diverged,
 and have 2 and 3 different commits each, respectively.
   (use "git pull" to merge the remote branch into yours)

 All conflicts fixed but you are still merging.
   (use "git commit" to conclude merge)

 Changes to be committed:

	modified:   app/config/app.php
	modified:   app/controllers/backend/UserController.php
	modified:   app/routes.php
	modified:   app/views/backend/pages/user-all.blade.php
	modified:   app/views/font/post.blade.php
	modified:   composer.json