Employee search completed with pagination
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