Was a Hell of a Ride
Merge https://github.com/popcorn-time/popcorn-app into popcorn-master

Conflicts:
	.gitignore
	Gruntfile.js
	README.md
	css/animations.css
	css/app.css
	dist/windows/windows-installer.iss
	index.html
	js/app.js
	js/frontend/controllers/filter.js
	js/frontend/controllers/home.js
	js/frontend/controllers/search.js
	js/frontend/models/movie.js
	js/frontend/providers/opensubtitles.js
	js/frontend/providers/torrents.js
	js/frontend/providers/yifysubtitles.js
	js/frontend/router.js
	js/frontend/views/listview.js
	js/frontend/views/movie.js
	js/frontend/views/page.js
	js/frontend/views/sidebar.js
	js/vendor/video-js/demo.html
	js/vendor/video-js/video.dev.js
	language/de.json
	language/en.json
	language/es.json
	language/fr.json
	language/it.json
	language/ja.json
	language/nl.json
	language/no.json
	language/pt-br.json
	language/pt.json
	language/ro.json
	language/sv.json
	language/tr.json
	package.json
	sass/_animations.scss
	sass/_layout.scss
	sass/_moviedetails.scss
	sass/_player.scss
Merge branch 'popcorn-master'

Conflicts:
	css/app.css
	dist/windows/windows-installer.iss
	index.html
	js/app.js
	js/frontend/controllers/filter.js
	js/frontend/controllers/search.js
	js/frontend/models/movie.js
	js/frontend/providers/torrents.js
	js/frontend/router.js
	js/frontend/views/listview.js
	language/es.json
	language/kr.json
	language/sv.json
	package.json
	sass/_layout.scss
	sass/_player.scss