#664
Merge branch 'dev-0.3' of https://github.com/popcorn-official/popcorn-app into dev-0.3

Conflicts:
	src/app/settings.js
settings.js change