Add a reference to the wiki FireQOS tutorial
Add news item about v2.0.0-pre6 release
Merge branch 'master' into test

Conflicts:
	content/tutorial.html
Automatically detect the branch we are building
Clean up and reorganise overview info