solr stuff
git ingore
solved conflicts
 readded Entity annotations