Small correction in Q.Pointer.wheel function
Merge branch 'master' of https://github.com/EGreg/Q

Conflicts:
	platform/plugins/Streams/files/Streams/icons/default/50x.png
	platform/plugins/Streams/files/Streams/icons/default/80x.png
	platform/plugins/Users/files/Users/icons/future/80.png
Merge branch 'master' of https://github.com/EGreg/Q

Conflicts:
	platform/classes/Q.js
	platform/plugins/Q/web/js/Q.js
Merge branch 'master' of https://github.com/EGreg/Q