added crud for department
added phpunit test for Department
fixed up test now properly work for Department module
fixed conflicts