now working on 3.6.13
add additional docs on callbacks
Merge branch '3.6.x' into gh-pages
 do no not know who made this change
add documentatiuon about callbacks

Conflicts:
	docs/queries.jade
add information about callbacks
add information about callbacks
add more docs on callbacks
add more docs on callbacks
Merge branch '3.6.x' into gh-pages