more goddam responsive bullshit
conflict resolved
Merge branch 'master' of github.com:cyborgspider/locus
some android specific styles