Sami config
Sami config
Corrections in gitignore
Merge branch 'wip'

Conflicts:
	sami.config.php
Merge branch 'master' into dev

Conflicts:
	sami.config.php