Merge remote-tracking branch 'origin/diffquery3' into diffquery
Merge remote-tracking branch 'origin/diffquery3' into diffquery
merging in dan improvements

Merge branch 'diffquery' of github.com:sociam/indx into diffquery3
oops css forgot to add