Merge pull request #14 from Shwetakale/master

User's profile and personal profile edit completed
Help modal added for creating CSV file
Merge branch 'master' of github.com:joshsoftware/office_automation_employee
Removed mongoid-grid_fs gem
Merge pull request #15 from Shwetakale/master

User's Profile edit completed
notification for invalid csv upload added
Merge branch 'master' of github.com:joshsoftware/office_automation_employee

Conflicts:
	Gemfile
	app/assets/javascripts/office_automation_employee/registrations.js.coffee
	app/models/office_automation_employee/user.rb
	app/uploaders/file_uploader.rb
	app/views/office_automation_employee/shared/_company.html.haml
	app/views/office_automation_employee/users/_personal_profile.html.haml
	app/views/office_automation_employee/users/_profile.html.haml
	app/views/office_automation_employee/users/edit.html.haml
	spec/dummy/config/environments/development.rb
edit company profile and invitation notifier added
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