conflict solved
search box and layout changes
search box and layout changes
Merge pull request #13 from raviosc/developer125

Developer125