fix embeded search
merge conflicts
Merge branch 'development'
Merge branch 'development'
 second attempt at removing memcache from 10Layer