Search API added. Appacitvit persistance code added. Testing is remaining.
Merge branch 'master' into ui-changes