Merge branch 'master' into LRDOCS-493
LRDOCS-493 Updated screenshot, replaced Lorem Ipsum text with some Asset Publisher related instructions
Merge branch 'master' into LRDOCS-493
LRDOCS-354 Added versions of LibreOffice, ImageMagick, and Xuggler; added tip that if running Liferay on a Linux server, you might need to update glibc in order to for Xuggler to work
Merge pull request #518 from jrao/LRDOCS-493

http://issues.liferay.com/browse/LRDOCS-493
Merge pull request #521 from jrao/LRDOCS-354

http://issues.liferay.com/browse/LRDOCS-354
Merge branch 'master' into refactor-props-converter