Added environment-based site title
Using environment-based site title
Setting site title
Merge branch 'master' into testing

Conflicts:
	lib/config/env/test.js