Employee search completed with pagination
Merge pull request #17 from yogeshjain999/master

edit company profile and invitation uploader added
Employee search completed
Merge https://github.com/joshsoftware/office_automation_employee

Conflicts:
	app/controllers/office_automation_employee/users_controller.rb
	app/models/office_automation_employee/user.rb
	app/views/office_automation_employee/users/index.html.haml
	spec/controllers/office_automation_employee/users_controller_spec.rb
	spec/dummy/config/environments/development.rb
Search completed
Search completed
Mailer updated
Merge pull request #16 from Shwetakale/master

Employee search completed with pagination
edit company profile and invitation notifier added
Seed data added
Merge pull request #18 from Shwetakale/master

Seed data added
Merge branch 'master' of github.com:joshsoftware/office_automation_employee

Conflicts:
	app/controllers/office_automation_employee/users_controller.rb
	app/views/office_automation_employee/users/index.html.haml
	spec/controllers/office_automation_employee/users_controller_spec.rb
Merge branch 'master' of github.com:joshsoftware/office_automation_employee
Different seed data for test & dev enviornment
Rake task for seed data
Address updated
Test cases updated
Changes completed
Merge pull request #19 from Shwetakale/master

Rake task for seed data created and address updated
adding errors in csv file and deactivating user