Better comment for index.
Comment to index.
Two changes.
Merge branch 'luca-exp1' into luca. Manually fixed conflicts.

Conflicts:
	controllers/default.py
michael change