Tracking user activities
Reset Password failed #677
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/views/layouts/_sidebar_menu.html.erb