Rickshaw example now working
Docs
Merge branch 'x_original' into htdocs

Conflicts:
	ReadMe.rst
	media/template/app.html
	www/js/app.js