LRDOCS-463 Added information on JSR-286's specification for the <portlet-info> tag
LRDOCS-463 Added list of variables that the <portlet:defineObjects> tag makes available to a JSP page
LRDOCS-463 Clarified what happens if you specify values for a portlet's title, short title, and keywords both in portlet.xml's portlet-info tag and in a resource bundle; explained best practice regarding where to specify these values
LRDOCS-463 Edit portlet-info element information
Re-update web content editors that were changed
Recommit previous changes that were reset
LRDOCS-463 Merged Jim's edit (commit 5896358) manually
LRDOCS-463 03-portlet-dev... Minor edits
Merge branch 'master' into LRDOCS-463
03-portlet-dev... - format code
06-hooks - format code
02-plugins-sdk - formatting
04-themes-dev... - wrap code to 80 columns
05-layout-templates - format code
03-portlet-dev... - format code
Merge branch 'master' into web-content-editor

Fixed Conflicts:
	userGuide/en/chapters/03-advanced-web-content-management.markdown
	userGuide/en/chapters/06-asset-framework.markdown
LRDOCS-344 Edited the Structure Default Value section and added a couple new images
LRDOCS-529 Addressed Layout Template comments and provided several other small changes
LRDOCS-531 Update theme Thumbnails section
Removed build.[user].properties file from Dev Guide's Plugins SDK