Merge pull request #12 from Shwetakale/master

Company registration view updated
sticky footer added
Models updated
Company registration updated
Merge branch 'master' of github.com:joshsoftware/office_automation_employee

Conflicts:
	Gemfile
	app/views/office_automation_employee/devise/registrations/new.html.haml
	spec/dummy/config/initializers/secret_token.rb
sending multiple invitation asynchronously done

Emails and roles can be taken from text fields or from uploaded csv file.
Help modal added for creating CSV file
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