modify dialog layout
modify dialog layout
Merge branch 'master' of https://github.com/r02525054/colony

merge by tao
add btn_today and btn_eye(s)