Merge remote-tracking branch 'remotes/origin/jungmin' into youngjae

Conflicts:
	app/controllers/controllers.js