added query to solr for annotations in Location and Timeseries Detail/List
Less inefficient annotation count. But still slow?
Merge branch 'master' of github.com:ddsc/dikedata-api into fritz_annotation_count
removed queries from location serializer
Merge branch 'master' into fritz_annotation_count
Merge pull request #4 from ddsc/fritz_annotation_count

added query to solr for annotations in Location and Timeseries Detail/Li...