A
Fixed conflict
Made changes
 Blah
Merge branch 'uploadscript' of https://github.com/NJLucyk/Interactome into search
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Interactome into search
Begun inserting solr code
Fixed strange code issue
Modified search so when a user searches for something it returns the first 100 results with that term in the abstract text. All this does is list each result's title and id. There is no communication with dynamo so we can view the abstracts. Also searching is being done on test data right now and solr is not hosted on ec2 yet.
Continuing to play around with searching
Fixed conflicts
stuff
Finishing up changes
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Interactome into search
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Interactome into search
Changed some stuff with search view
Fixed merge conflict
Added capability for multiple field searching
headerctrl to mainctrl topic-based rec works
Replaced ajax request with more angular http request to Solr. Geting CORS error when trying to make request through search service.