Merge branch 'master' of github.com:slaeshjag/birdie25

Conflicts:
	client/object.c
