Changes with permissions
permissions
conflict fixed
nazar's changes with permissions
devise folder added
show changed
Merge branch 'nkoval'