Merge remote-tracking branch 'polini/TvheadendMobileUI/master' into webui/mobileui2

Conflicts:
	README.md