Changes to IdeaController
Merge branch 'master' of https://github.com/UpstreamApp/Upstream
Merge branches 'master' and 'master' of https://github.com/UpstreamApp/Upstream