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
Merge pull request #365 from codyhoag/scheduler-ug

LRDOCS-352: removed property and description (hasn't been used since 6.0...
Merge pull request #366 from jhinkey/marketplace-version-updates

Dev Guide Marketplace version updates
Merge pull request #368 from codyhoag/props-update-ug

LRDOCS-377 Update "Properties Reference" with modifications
Merge pull request #371 from codyhoag/ally-typo-6.1.x

removed "ally" typo for 6.1.x
Merge pull request #376 from jrao/LRDOCS-371-6.1.x

http://issues.liferay.com/browse/LRDOCS-371
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