@function - done
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Intranet/MainBundle/Controller/IndexController.php