Improve infinite scroll rendering
Merge remote-tracking branch 'upstream/master'
fixing some bugs in the infinite scroll
Use the https protocol instead of git
Update fr.json

Changed some typos in french, like the plural of légal is légaux. ref:http://www.larousse.fr/dictionnaires/francais/légal_légale_légaux/46554

And also the language, turkish is "turc". ref: http://fr.wikipedia.org/wiki/Turc
Merge remote-tracking branch 'upstream/master'
Fix slash caracteres in search query
fix russian translation
Merge branch 'master' of https://github.com/gen1us/popcorn-app
Improve infinte scroll css animation

Clean old css for pagination
Added customSubtitles plugin
Custom Subtitles

Added customSubtitles plugin initialization.

· Huge cleanup on CustomTrackMenuItem.prototype.loadSubtitle's hack:
Downloading, Decompressing, Decoding process was split on separate
functions. (getSub, decompress and decode)
· getSub also supports local file system subtitles.
· decompressing is only done when the file extension is .zip
Merge branch 'master' of https://github.com/popcorn-time/popcorn-app into feature/#19
Merge pull request #431 from luuse/https_repo_urls

Use the https protocol instead of git
Merge pull request #456 from thefuture2092/patch-1

Update fr.json
Merge branch 'feature/#19' of git://github.com/ivantodorovich/popcorn-app
Adds support for custom subtitles.
Fixed a bug with external subs. Added our fork of peerflix to the packages.
Merge pull request #479 from gen1us/master

Fix russian translation
Merge pull request #476 from PerfectSlayer/slash-search

Fix search containing slash caracters
Fixed an error with the backdrop loader.