Merge branch 'jungmin' of https://github.com/AcousticDavid/hub1_git into youngjae

Conflicts:
	app/views/layout.hbs
	public/js/lib/underscore-1.7.0.js