Updated stable with new contrib commands, including test, watch, server
Merge branch 'stable'

Conflicts:
	contrib.json