ajax change
Merge branch 'master' into platanos

Conflicts:
	platanos.html
added more initialization methods for doc
more work
bfunction and afunction
Merge branch 'master' into platanos
ok
ok
ok
ok
Merge branch 'master' into platanos