Merge origin/master

Conflicts:
	app/config/security.yml
	src/ABC/IsystemBundle/Resources/views/AbcLayout/menu.html.twig
	src/ABC/IsystemBundle/Resources/views/Secured/loginWidget.html.twig