Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'release/0.6.2'

Conflicts:
	README.md
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'release/0.6.3'
Merge branch 'release/0.7'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop', version 0.7.3
Merge branch 'develop', version 0.7.4