checkboxes changes
Merge conflcits
Merge branch 'master' of https://github.com/ranokmai/wmm