Roberto Rosario
efdf08eb90
Merge branch 'development'
Conflicts:
docs/credits/contributors.rst
docs/index.rst
docs/intro/installation.rst
mayan/apps/converter/templates/converter_file_formats_help.html
mayan/apps/document_indexing/templates/indexing_help.html
mayan/apps/documents/templates/document_types_help.html
mayan/apps/documents/templates/recent_document_list_help.html
mayan/apps/dynamic_search/templates/search_help.html
mayan/apps/folders/templates/folders_help.html
mayan/apps/linking/templates/smart_links_help.html
mayan/apps/metadata/templates/metadata_set_help.html
mayan/apps/metadata/templates/metadata_type_help.html