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