Temp fix

TODO: Make sure we works fine with latest version of peerflix
Merge branch 'dev-0.3' of github.com:popcorn-official/popcorn-app into dev-0.3

Conflicts:
	src/app/language/fr.json