changed version
Merge branch 'dev'

Conflicts:
	style.css
Merge branch 'master' into release
Merge branch 'release' of https://github.com/OCG-labs/one-theme into release

Conflicts:
	style.css