Added Maven section
Merge branch 'master' into maven-dg
Merge remote-tracking branch 'codyhoag/maven-dg' into maven-dg
maven edits and wordsmithing
hard returns in several areas
Merge remote-tracking branch 'codyhoag/maven-dg' into maven-dg
updated maven with more settings and instructions
Merge remote-tracking branch 'codyhoag/maven-dg' into maven-dg
Maven edits up to "Using Liferay Maven artifacts"
Merge branch 'master' into maven-dg

Conflicts:
	devGuide/en/chapters/02-plugins-sdk.markdown
remove "dist-win" target
extend prefix used for .zip and .markdown files during dist
Merge branch 'master' into dist-win-update
Merge branch 'master' into dist-win-update
Merge branch 'dist-win-update' of git://github.com/codyhoag/liferay-docs into LRDOCS-383-ant-dist
LRDOCS-402 - Updating existing screenshots
LRDOCS-402 - Documenting new features and adding new screenshots
added more detail to the Solr instructions per LRDOCS-223
modified other targets for compatibility with new prefix
proofread Bruno's iOS Sync docs, made a few wordsmithing edits