edit company profile and invitation notifier added
Merge branch 'master' of github.com:joshsoftware/office_automation_employee

Conflicts:
	app/controllers/office_automation_employee/users_controller.rb
	app/views/office_automation_employee/users/index.html.haml
	spec/controllers/office_automation_employee/users_controller_spec.rb
Merge branch 'master' of github.com:joshsoftware/office_automation_employee
adding errors in csv file and deactivating user
Merge branch 'master' of github.com:joshsoftware/office_automation_employee

Conflicts:
	app/models/office_automation_employee/personal_profile.rb
	app/models/office_automation_employee/user.rb
	db/seeds.rb
	spec/controllers/office_automation_employee/invitations_controller_spec.rb
adding turbolinks
Merge pull request #20 from yogeshjain999/master

SuperAdmin functionality and turbolinks are added