Merge branch 'master' of https://github.com/tapandtypeahm/minex

Conflicts:
	lib/department-functions.php
updated