Merge branch 'develop' into feature/options
auto state toggles and profile link
Merge pull request #18 from ynotLeft/feature/options

Feature/options