UP-3284:  Perform the guest user name comparison in a case-insensitive way;  some LDAP setups (MS AD) have a 'Guest' user account that is making the first letter uppercase and therefore generating a bad result from this method
UP-4034:  Add a portlet preference to the portal-activity portlet to toggle display of popular searches

Conflicts:
	uportal-war/src/main/webapp/WEB-INF/jsp/Activity/activity.jsp
Added node_modules/ and nom-debug.log