Models updated
Company registration updated
Merge pull request #13 from yogeshjain999/master

seding multiple invitation asynchronously
Models updated
Edit user's profile and personal details completed
Test cases for user controller added
Conflicts:
	Gemfile
	app/controllers/office_automation_employee/registrations_controller.rb
	app/controllers/office_automation_employee/users_controller.rb
	app/models/office_automation_employee/user.rb
	app/views/layouts/office_automation_employee/application.html.haml
	app/views/office_automation_employee/users/edit.html.haml
	app/views/office_automation_employee/users/index.html.haml
	app/views/office_automation_employee/users/show.html.haml
	config/routes.rb
	office_automation_employee.gemspec
User controller updated
Locally uploaded files removed
Unnecessary files removed
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
Profile edit completed
Specs for file upload added
Changes completed
Changes completed
Changes completed
Merge pull request #15 from Shwetakale/master

User's Profile edit completed
notification for invalid csv upload added