latest changes from kazoo_dev to iPad_dev (bypassing master until kazoo releases)