Avatar option
Merge branch 'avataroption' into muh

Conflicts:
	connector.rb