Merge branch 'master' of github.com:openlayers/ol3 into vector

Conflicts:
	src/ol/renderer/canvas/canvasrenderer.js
	test/ol.html