First pages commit
Merge branch 'gh-pages' into sklearn

Conflicts:
	doc/conf.py