merge edit user page
Merge branch 'master' of https://github.com/trangnt57/socio_quiz into trangnt57-master

Conflicts:
	app/views/devise/registrations/edit.html.erb
	app/views/quizzes/_form.html.erb
Merge branch 'trangnt57-master'