added shell bullet alter user
Merge remote-tracking branch 'origin/master'

Conflicts:
	shell_bullet