Merge pull request #157 from jhaybie/finalTouches

Final touches
search view with textview n button!
Merge pull request #158 from deebost/master

search view with textview n button!
Merge remote-tracking branch 'origin/master' into majorRefactoringRootVC
more overhauling work (not completely stable yet)