Select Document Types for applying User Permissions
Handle conflicting User Permission DocTypes and DocPerm translations
permission_manager.js translation
doclistview, no {0} found.
setup.py, translated.

Issue exists: read, write etc translation doesn't show.(note, not sure if it is case sensitive)

Conflicts:
	frappe/core/page/permission_manager/permission_manager.js
[minor] translations in appframe and listing
[fix] Handle clear notifications deadlock
Merge pull request #797 from anandpdoshi/anand-auaugst-25

[fix] Handle clear notifications deadlock
Merge pull request #795 from anandpdoshi/user-permission-doctypes

Select Document Types for applying User Permissions
[fixes] [website] for translator
[fixes] [website] for translator
Merge pull request #799 from rmehta/website-minor

[fixes] [website] for translator
[fix] [database.py] cleanup index size from name
Typo Error ? frappe.client.submit fail

- Frappe client use this submit function and failed due to doclist is actually a {dict} or a [list]. Both cannot have as_dict() function 
- Seem like just a typo -> change to doclistobj instead.
Merge pull request #803 from nathando/patch-1

Typo Error ? frappe.client.submit fail
[fix] #800, #802
[fix] file manager queries
[fix] user_to_str with moment.js, accept 2 digit year values
[fix] To edit using report, ID field should be selected in report
User Permission DocTypes: Apply OR logic when multiple applicable roles have different sets of User Permission DocTypes
Merge pull request #798 from anandpdoshi/anand-august-28

OR logic for conflicting User Permission DocTypes, fixes in file manager and user_to_str with moment.js
Merge https://github.com/frappe/frappe into develop