Merge remote-tracking branch 'WIP' into 'Master'
Made device/android info method alot easier, also cleaned up strings etc for an easier read/work flow ..
Merge remote-tracking branch 'origin/WIP' into WIP
Merge remote-tracking branch 'origin/WIP'

n/WIP' into WIP"

This reverts commit 55f26308c1f82dc95d094583c92e9ba022568169, reversing
changes made to d7405c35c0ca37e0d97be16d0ecd8b2a3cd1113d.