....
Merge remote-tracking branch 'BusMapiOS/master'
sua 1 so koi: man hinh dim view, tu dong co dan