[knowledge base] added all permissions
[files] [patch] dropped file_list property and moved links to
[files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup
[files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup
[files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup
[files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup
[files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup
[files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup
[files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup
[file] [patch fix]
Merge branch 'master' into edge

Conflicts:
	patches/patch_list.py
Merge branch 'master' of github.com:webnotes/erpnext into edge
[editor] [stylefix]
Merge branch 'edge' of github.com:webnotes/erpnext into edge
Merge branch 'master' into edge

Conflicts:
	home/page/latest_updates/latest_updates.js
	hr/doctype/employee/employee.txt
Merge branch 'master' into edge
Merge branch 'master' into edge

Conflicts:
	website/doctype/website_settings/website_settings.txt
[employee] [fix] removed erroneous break statement
Merge branch 'master' into edge
Merge branch 'master' into edge