Update changelog and prep for v1.0.4

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch 'staging' into develop

Signed-off-by: crynobone <crynobone@gmail.com>

Conflicts:
	docs/changes.md