Make PVR optional
Make WiFi optional
Merge branch 'master' of git://github.com/OpenELEC/OpenELEC.tv
Merge branch 'master' of git://github.com/OpenELEC/OpenELEC.tv

Conflicts:
	packages/mediacenter/xbmc/package.mk
	packages/network/connman/package.mk
Merge branch 'master' of git://github.com/OpenELEC/OpenELEC.tv
Build fails when using 4 parallel builds
Added newly introduced options
Merge branch 'master' of git://github.com/OpenELEC/OpenELEC.tv
Merge branch 'master' of git://github.com/OpenELEC/OpenELEC.tv

Conflicts:
	packages/network/connman/package.mk
Merge branch 'master' of git://github.com/OpenELEC/OpenELEC.tv
Add missing gmake symlink