Salut
Merge branch 'master' of github.com:misterj/NF17

Conflicts:
	library/Application.php