Add academic units and faculties
Merge branch 'master' of github.com:alphasusu/alphasusu

Conflicts:
	db/schema.rb
	lib/tasks/data_import.rake