Merge branch 'master' of https://github.com/raspberrypi/userland

Conflicts:
	host_applications/linux/apps/raspicam/RaspiCamDocs.odt
Merge branch 'master' of https://github.com/dmopalmer/userland

Conflicts:
	host_applications/linux/apps/raspicam/RaspiCamDocs.odt