Unified torrent resolving for custom torrents; makes sure magnet uris/links to torrent files are first stored as .torrent so that file selector (in case there are more than one video files) is actually used
Corrected torrent cache timeout to 1min, changed indenting to tabs for easier merge
Jsbeautify some files for easier merge
Merged with pt master
Ignore en.json
Added getcurrentlist()
Making the Trakt Post method actually post.
Merge branch 'master' of https://git.popcorntime.io/stash/scm/~sv244/popcorn-app into api/new-methods

Conflicts:
	src/app/httpapi.js
Merge pull request #77 in PT/popcorn-app from ~THESAVIOR/popcorn-app:bugfix/traktpost to master

* commit '9bd55db184c88a35f88e529ab1cc287ac4594261':
  Making the Trakt Post method actually post.
Fix select next episode in series bugging out if next episode is not available

such as if just watched episode 10 and next available is 13
Merge pull request #79 in PT/popcorn-app from bugfix/tv_detail_episode_jump_to to master

* commit '97d2cb86f62c8cc6411c6f266382b1b6db1e08a2':
  Fix select next episode in series bugging out if next episode is not available
Adding the sync strings to en.js
Merge pull request #80 in PT/popcorn-app from ~THESAVIOR/popcorn-app:fix/synclang to master

* commit '3710b49eb2d667386fdfeeecbe91e3668970b09d':
  Adding the sync strings to en.js
Adding lots of strings missing from en.json
Merge pull request #81 in PT/popcorn-app from ~INSERTCOIN/popcorn-app:master to master

* commit 'f38771a6eb153abea1dc46881c5ac040e3fd3146':
  Adding lots of strings missing from en.json
Fixed JSHint
Moving beautify settings into separate .jsbeautifyrc file.
Fixed 'getplayers' and added 'setplayer'
Updated docs
Fixed JSHint