Merge remote-tracking branch 'remotes/upstream/master' into igor_dev
Merge remote-tracking branch 'remotes/igor/dev' into igor_dev
Added new functional
Merge remote-tracking branch 'remotes/upstream/master' into Added_new_functional

Conflicts:
	app/AppKernel.php
	app/Resources/views/layout.html.twig
	app/config/config.yml
	app/config/routing.yml
	composer.json
	web/js/main.js
fixes
Merge pull request #54 from lensky84/Added_new_functional

Added new functional