[finish #70665278]
search
styles
styles
styles
styles
bugs
Merge branch 'developer/davidsingal' into dev