?
Merge branch 'master' of https://github.com/gmgj/vbusb

Conflicts:
	CodeSniffer/Standards/GJ/ruleset.xml
	CodeSniffer/Standards/RSI3/testinlinecontrol.php
Merge branch 'master' of https://github.com/gmgj/vbusb