Merge branch 'develop' of https://github.com/framgia/fels_16 into develop

Conflicts:
	app/controllers/lessons_controller.rb
	app/models/users_answer.rb
	app/views/lessons/new.html.erb