Merge branch 'enhanced-interface'

Conflicts:
	demos/clustering.py
	demos/svr.py
	pages/views.py