Dev Guide - frameworks - Edit JSON Web Service section.
Dev Guide - frameworks - Fix typo at start of Mapping and Naming Conventions section. Format to 80 columns.
Merge branch 'master' into devguide-ch-5

Conflicts:
	devGuide/en/chapters/05-remote-services.markdown
Merge pull request #714 from jhinkey/devguide-ch-5

6.2 JSON Web Services - Edited