merge
search array
map bug
Merge branch 'developer/davidsingal' into dev