update toolbar
fixed ua bug
fixed conflict
fixed comflict
fixed coflict
update pagingbar