Merge remote-tracking branch 'origin/diffquery3' into diffquery
Fix clobbered diffs
dan fixed diff

Merge branch 'diffquery' of github.com:sociam/indx into diffquery3
Added some ng-animate