Work in progress, divider for departments
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/create_divisons.js
Merge remote-tracking branch 'origin/master'