Starbucks and labour union reach agreement, proxy fight ends