Test cases updated
Test cases updated
Merge https://github.com/joshsoftware/office_automation_employee

Conflicts:
	app/models/office_automation_employee/company.rb
Merge pull request #6 from Shwetakale/master

Test cases updated