updates
Merge branch 'master' of http://github.com/allevaton/cherrypy-site into pull

Conflicts:
	app.conf
	main.py