Drunk-Lee & Missing Variables

I apparently introduced a few missing variables when i was drinking..
i blame drunk-lee.
Merge branch 'master' into develop

Conflicts:
	CHANGELOG.md
	manifest.json