Updated documentation
Merge branch 'master' of bitbucket.org:icaoberg/ricerca

Conflicts:
	ricerca/content.py
Updated documentation in main methods
Merge branch 'master' of bitbucket.org:icaoberg/ricerca

Conflicts:
	ricerca/content.py