Merge branch 'master' into release
Add Redux Core Module
Merge branch 'master' into release
Merge branch 'master' into release
Merge branch 'master' into release
Update style.css
Merge branch 'release' of https://github.com/OCG-labs/one-theme into release

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