Update userGuide/en/chapters/15-management.markdown

Repeated commit from 6.2.x branch. @sez11a
opensocial address fix
link fix for 6.1.x
Update userGuide/en/chapters/18-using-scripting.markdown

Fixed broken return in 6.1.x branch of Ch 18 UG. @sez11a
LRDOCS-352: removed property and description (hasn't been used since 6.0.x)
Updated versioning info and added filename specification info
Update devGuide/en/chapters/13-marketplace.markdown

Wordsmith Marketplace version update
Update devGuide/en/chapters/13-marketplace.markdown

Format Marketplace versioning update
Update devGuide/en/chapters/13-marketplace.markdown

Adjusted example app WAR name
LRDOCS-377 Update "Properties Reference" with modifications
removed "ally" typo for 6.1.x
fixed typo - changed incorrect reference to ch 2 to correct reference to ch 3
added the Sync Android docs from Bruno to 6.1.x docs
typo and reformat properties
fixed broken link
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.