[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