Merge branch '7.x-2.x'
Stripping CVS keywords
#996604 by bangpound: Fix syntax error.
Added extra files.
Updated QueryPath to 2.1 final
Updated documentation
Added auxilliary files