http://issues.liferay.com/browse/LRDOCS-481 and http://issues.liferay.com/browse/LRDOCS-487

http://issues.liferay.com/browse/LRDOCS-481 and http://issues.liferay.com/browse/LRDOCS-487

Added new section on searching for specific kinds of content in liferay, searching for comments and attachements, and the differences between the Search portlet, Web Content Search portlet, and the Blogs, Message Boards, Wiki, Documents and Media, and Web Content portlet's search bars.

Resolved merge conflict, renumbered images, fixed image URLs