Merge branch 'dev'
Merge branch 'release/1.1.0'
Add guidelines for branching
Merge branch 'contrib' into dev

Conflicts:
	CONTRIBUTING.rst