Add manuafacturer info, fix too greedy regexes, improve andoid device detection
Add manuafacturer info, fix too greedy regexes, improve andoid device detection
Merge pull request #447 from cjnoyescrisp/master

Android Improvements
Merge remote-tracking branch 'tobie/master'

Conflicts:
	regexes.yaml
	test_resources/test_device.yaml