added the Sync Android docs from Bruno to 6.1.x docs
typo and reformat properties
fixed broken link
Merge pull request #380 from jrao/LRDOCS-390-6.1.x

http://issues.liferay.com/browse/LRDOCS-390
Merge pull request #382 from codyhoag/jabber-typo-6.1.x

Typo and reformat properties (6.1.x)
Merge pull request #383 from codyhoag/xuggler

Fixed broken link (6.1.x)
Wordsmithing.

Conflicts:
	userGuide/en/chapters/19-configuring-for-high-availability.markdown
Merge pull request #386 from jrao/LRDOCS-402

http://issues.liferay.com/browse/LRDOCS-402
Merge pull request #389 from stephenkostas/glassfish-instructions

removed now unnecessary glassfish hacks
Merge pull request #390 from stephenkostas/staging-warning

added warning about not being able to activate staging on populated site...
Added missing images from master branch.