ciritical fix on overview page
Merge branch 'additions'

Conflicts:
	public/javascripts/main.js