Sample config format.
Sample config format.
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/development.json