Merge pull request #4 from DannyJoris/7.x

coder cleanup
Fixes for translatability.
Merge pull request #5 from adam-vessey/7.x

Fixes for translatability.
updated Solr views to latest Solr code