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
Began editing ADT documentation
More edits, need to see old version so committing now
Edited the Application Display Templates section
Edits to ADT section
Merge branch 'master' into adt-edits
More ADT editing