fix the comment mo betta
Merge branch 'newfeature'

Conflicts:
	user_request.rb
add mark_active! method