Merge branch 'luciano' of bitbucket.org:ikflowdat/ftth into luciano

Conflicts:
	app/config/parameters.yml.docker