Merge branch 'master' of github.com:joshsoftware/office_automation_employee

Conflicts:
	app/views/office_automation_employee/devise/registrations/_edit.html.haml
adding dependency for remotipart
Merge branch 'master' of github.com:yogeshjain999/office_automation_employee