Merge branch 'develop'

Conflicts:
	website/ninja_web/templates/downloads.html
	website/ninja_web/templates/intro.html
Solved merge.