Merge branch 'eventlisting-adt' of git://github.com/jhinkey/liferay-docs into portlet-preferences-dg
Merge branch 'eventlisting-adt' of git://github.com/jhinkey/liferay-docs into portlet-preferences-dg
Merge branch 'eventlisting-adt' of git://github.com/jhinkey/liferay-docs into portlet-preferences-dg
Merge branch 'eventlisting-adt' of git://github.com/jhinkey/liferay-docs into portlet-preferences-dg
LRDOCS-641: Partial code for configuration example
Merge branch 'portlet-preferences-dg' of https://github.com/codyhoag/liferay-docs into portlet-preferences-dg
Merge branch 'eventlisting-adt' of git://github.com/jhinkey/liferay-docs into portlet-preferences-dg
LRDOCS-641: Additional modifications for portlet pref example
Merge branch 'portlet-preferences-dg' of https://github.com/codyhoag/liferay-docs into portlet-preferences-dg
LRDOCS-641: Add example for config portlet prefs
LRDOCS-641: Code changes to location listing portlet in devGuide-sdk
LRDOCS-641: Source Formatting
LRDOCS-641: Wordsmithing and formatting
LRDOCS-641: Compiled jar files
Merge branch 'portlet-preferences-dg' of https://github.com/codyhoag/liferay-docs into portlet-preferences-dg-temp
LRDOCS-641 Extend DefaultConfigurationAction and configure it as the <configuration-action-class>
LRDOCS-641 Add the c, liferay-theme, and liferay-portlet TLDs
LRDOCS-641 Add the configuration.jsp, use the preference via portletPreferences variable, and add directives to common classes/tlds in init.jsp.
Merge branch 'portlet-prefs-test' of github.com:jhinkey/liferay-docs into portlet-preferences-dg-temp

Conflicts:
	devGuide/code/devGuide-sdk/portlets/event-listing-portlet/docroot/WEB-INF/liferay-plugin-package.properties
	devGuide/code/devGuide-sdk/portlets/event-listing-portlet/docroot/WEB-INF/liferay-portlet.xml
	devGuide/code/devGuide-sdk/portlets/event-listing-portlet/docroot/WEB-INF/src/com/nosester/portlet/eventlisting/action/ConfigurationActionImpl.java
	devGuide/code/devGuide-sdk/portlets/event-listing-portlet/docroot/html/init.jsp
	devGuide/code/devGuide-sdk/portlets/event-listing-portlet/docroot/html/locationlisting/configuration.jsp
	devGuide/code/devGuide-sdk/portlets/event-listing-portlet/docroot/html/locationlisting/view.jsp
LRDOCS-641 Fix view logic to always show action button and use local variable for portlet pref value.