Corrections

- new gitignore
- new Sami configuration
- correction in JS.php class
Merge branch 'wip'

Conflicts:
	.gitignore
	composer.json