update merge cancan

This commit is contained in:
Aung Myo
2017-06-27 16:55:56 +06:30
32 changed files with 50 additions and 743 deletions