task 16
Merge branch 'master' of github.com:agilejs/ninja

Conflicts:
	client/partial/index.html