Minor wordsmithing and updating to 6.2.
Merge branch 'master' into websphere

Conflicts:
	userGuide/en/chapters/15-installation-and-setup.markdown
Finished WebSphere install instructions.
Merge branch 'master' into weblogic-12c