densan edit
Merge commit 'a6d36d7c94b8b3e8f0c402d50fbed1329a19aaaf'

Conflicts:
	public/javascripts/index.js