Merge pull request #20 from yogeshjain999/master

SuperAdmin functionality and turbolinks are added
Ajax for profile edit
Merge https://github.com/joshsoftware/office_automation_employee

Conflicts:
	Gemfile
	app/assets/javascripts/office_automation_employee/application.js
	app/controllers/office_automation_employee/users_controller.rb
	app/views/office_automation_employee/users/_profile.html.haml
	app/views/office_automation_employee/users/edit.html.haml
Ajax for user's update action
Ajax for user's update action
Merge pull request #21 from Shwetakale/master

Ajax for user's update action
adding generator for initial configuration
Merge branch 'master' of github.com:joshsoftware/office_automation_employee

Conflicts:
	app/views/office_automation_employee/devise/registrations/_edit.html.haml