closes #20
version bump
Merge branch 'master' into gotham-dev

Conflicts:
	addon.xml
	changelog.txt