Brand Model

For device parsing a better segmentation is being introduced for Android and other Devices which targets Issue #281 as well. 
To get better device replacements the scheme, where appropriate, was changed to "Brand Model". Basically this affects "Apple i<Devices>" "Amazon Kindle" "Samsung <Androids>" and "Nokia Lumia".
Hope that's fine with all of you. Cheers.