new permission manager
new permission manager
Merge branch 'master' of github.com:webnotes/erpnext
new permission manager
Merge branch 'master' of github.com:webnotes/erpnext
Merge branch 'edge' of github.com:webnotes/erpnext into edge

Conflicts:
	patches/patch_list.py
Merge branch 'master' into edge
fixes to permission manager / user property setter
merge
updated latest_updates.js
Merge branch 'master' into edge
fixes to valid elements
Merge branch 'edge' of github.com:webnotes/erpnext into edge
patch_list merge
in feed show records of doctypes for which user has read permission at level 0
Merge branch 'edge' of github.com:webnotes/erpnext into edge