Fixed center alignment on loading screen.
Fixed alignment of elements on the information page.
Update NW path for grunt dist
Added setting to auto-play high quality (720p) episodes of TV Shows if they're available
Merge pull request #686 from HandsomeMatt/ui-polish

UI Polish - adjustment on element alignments
Cleaned settings.js
Show controls in trailers
Added a timeout to the SSL checks
Merge pull request #693 from JimmyThompson/dev-0.3-settings

Cleaned settings.js
Added some fixes to keyboard navigation (reverts dde07a613f70448d21b8139c077b2b0a361b338a)
Merge remote-tracking branch 'upstream/dev-0.3'

Conflicts:
	src/app/lib/views/player/player.js
	src/app/settings.js
Update to latest peerflix

Fix bugs from merge