+ session user_id
Merge remote-tracking branch 'origin/master'

Conflicts:
	add_device.php