Little changes
Some changes
Merge branch 'readonly'

Conflicts:
	index.html
	js/controllers.js