conflicting api_docs output resolve
Merge branch 'master' of https://github.com/steveoro/goggles

Conflicts:
	api_docs/sessions.txt
merged with conflicting api docs subdir (now removed from repository); new vers. 4.00.233