LRDOCS-704 Updated reference in the Liferay utilities apps chapter to the faceted search section; the faceted search section is now in chapter 6, not chapter 5
LRDOCS-621 Added a little more information about the calendar upgrade process
LRDOCS-704 Fixed merge conflict
Merge pull request #660 from jrao/LRDOCS-704

https://issues.liferay.com/browse/LRDOCS-704
Merge pull request #663 from codyhoag/calendar-portlet2

Calendar portlet check
Merge branch 'master' into dev-guide-03-portlets-6.2