added data attributes to search results for nina
deleted some merge conflicts
Merge pull request #30 from mule-deer-2014/yohan_katia_search

added data attributes to search results - ok