LMARKET-81:
Aligned custom folder menu properties and JSP files with LP 6.1 EE GA2 conventions.
Merge branch 'master' of https://github.com/permeance/liferay-menu-fix-sample