Add manuafacturer info, fix too greedy regexes, improve andoid device detection
Add manuafacturer info, fix too greedy regexes, improve andoid device detection