Models updated
Company registration updated
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
Merge pull request #14 from Shwetakale/master

User's profile and personal profile edit completed