Merge

Added search bar, think there is a problem with storyboard now ;(