LMARKET-67:
Merge Show Info custom folder menu item into default folder menu items.
LMARKET-67:
Merge branch 'master' of https://github.com/permeance/liferay-dm-info-viewer

Conflicts:
	src/main/webapp/WEB-INF/custom_jsps/html/portlet/document_library/folder_action.jsp