dep
Merge branch 'master' of ssh://github.com/dhuo14/bskb

Conflicts:
	app/views/kobe/departments/index.html.erb