Search Bar
Update
Merge branch 'master' of https://github.com/MacLiu/SplitPay

Conflicts:
Update
final updates