grid layout stuff
dp change
Merge branch 'master' of https://github.com/rawrjustin/det-android