Department view - started
Department grid templ
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/app/application.js
add_new_department.coffee added
Merge remote-tracking branch 'origin/master'
add_new_department.coffee edited
Merge remote-tracking branch 'origin/master'
add new department button in process
add new department button in process
add new department button in process
Merge remote-tracking branch 'origin/master'
add nd save department buttons done
Merge remote-tracking branch 'origin/master'
edit and delete buttons added
Merge remote-tracking branch 'origin/master'