Some syntax and grammatical changes
More space on movie list
Merge pull request #247 from ivanhovic/master

Some syntax and grammatical changes
Complete the transition to blue!

Can I add that `line_comments = false` to the Config.rb to get rid of
all that comment changes on every commit?
Fixing bad video player on Windows

On Windows native video player was used when user's screen was a touchscreen. I just deleted it and it solved the problem. So for everyone who had this issue, this is probably because you have a touchscreen.
Subtitles are now working fine and showing up (native video player only supports WEBVTT subtitles).
Merge pull request #267 from HJerem/patch-1

Fixing bad video player on Windows
Merge pull request #257 from JeremDsgn/layout

More space on movie list
Merge branch 'dev' of git://github.com/pvieito/Popcorn-Time
Added Norwegian language file
Merge pull request #269 from Mattivc/master

Added Norwegian language file
Some SCSS fixes

* Move Sidebar to -10px so it is completely invisible.
* Added the $popcorn_blue as a global Sass variable.
* es.json without ending return because Popcorn Time deletes it each
time its started.
Merged Pull Request #270 with a SCSS refactor
Merge remote-tracking branch 'upstream/master'
elements button and input for the torrent url