NS Site Bundle
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Ns/Site/NsSite.php
default parameters