Modified the app so it uses subapi
Merge branch 'master' of https://github.com/popcorn-time/popcorn-app
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/popcorn-time/popcorn-app