updated redux
Merge branch 'develop'