Update
Merge branch 'release/1.0'

Conflicts:
	octocat.txt
Merge branch 'hotfix/1' into develop