Merge pull request #1 from popcorn-time/master

Update 00002
Merge pull request #2 from popcorn-time/master

Update 00003
Merge pull request #3 from popcorn-time/master

Update
Merge pull request #4 from popcorn-time/master

Update
Reguionalization of subtitles - Pt-Br and Pt-Pt
Regionalization of subtitles - Pt-Br and Pt-Pt
Merge branch 'master' of https://github.com/popcorn-time/popcorn-app into popcorn-time-master

Conflicts:
	css/app.css
sass compile, change in flgs
recompile of sass
Merge pull request #191 from rpaggi/master

Regionalization of subtitles(Pt-Br/Pt-Pt)