Merge pull request #1331 from cesine/master

First full read through for citations & screenshots
typo check and small editing
Merge pull request #1333 from hisakonog/master

caml doc typo check and minor editing
another minor edit on the appendix section
moved all commented out stuff to one spot so we can use it or filter it later, before attaching on commenting out more stuff :) also decided not to include the appendix
Merge branch 'master' of github.com:hisakonog/FieldDB

Conflicts:
	docs/CAML/caml2012.tex