v3.1.0
Merge branch 'develop'

Conflicts:
	mix.exs