committing changes
Merge branch 'hotfix_edit_view' into development
fixed CanCan bug
Merge branch 'development' of github.com:alevsxm/Team-Doge into development