for merge
Merge branch 'master' of https://github.com/nanusdad/appl_admin
using meteor-editable