Merge pull request #50 from daniel-dgi/7.x

Removing manidora hacked simple solr search.
Added extra null check for the creative commons form.