Merge pull request #613 from jrao/master

Replacing CRLF with LF in affected files
12-ext-plugins - generalize product version and app server.
02-tools-and-dev Remove version number from Studio/IDE references
10-hooks - Replace <version> with [version]
02-tools-and-dev Generalize app server version.
11-marketplace - Update includes targetting Java 1.6, enabling security for paid apps, optional security for free apps, and refactored hook versioning example.
11-marketplace - Explain common security pitfalls.
05-remote-services - Remove special character.
Merge pull request #615 from jhinkey/dev-guide-chgs-from-6.1.x

Dev guide chgs from 6.1.x
Merge branch 'master' into trunk-service-builder