* Fixed import error
Merge branch 'develop' of https://github.com/syllog1sm/redshift into develop
Merge branch 'develop' of https://github.com/syllog1sm/redshift into develop
Merge branch 'develop' of https://github.com/syllog1sm/redshift into develop
Merge branch 'develop' of https://github.com/syllog1sm/redshift into develop
Merge branch 'develop' of https://github.com/syllog1sm/redshift into develop
Merge branch 'develop' of https://github.com/syllog1sm/redshift into develop
Merge branch 'develop' of https://github.com/syllog1sm/redshift into develop
Merge branch 'develop' of https://github.com/syllog1sm/redshift into develop
Merge branch 'develop' of https://github.com/syllog1sm/redshift into develop
Merge branch 'develop' of https://github.com/syllog1sm/redshift into develop
Merge branch 'develop' of https://github.com/syllog1sm/redshift into develop
Merge branch 'develop' of https://github.com/syllog1sm/redshift into develop
Merge branch 'develop' of https://github.com/syllog1sm/redshift into develop
Merge branch 'develop' of https://github.com/syllog1sm/redshift into develop
Merge branch 'develop' of https://github.com/syllog1sm/redshift into develop
Merge branch 'develop' of https://github.com/syllog1sm/redshift into develop
* Fixed merge conflict on setup
Merge branch 'develop' of https://github.com/syllog1sm/redshift into develop
Merge branch 'develop' of https://github.com/syllog1sm/redshift into develop