Update for Firefox 15 and 16
Update version
Fix for users who set the Word startup directory to the Zotero install directory (why!?!)
Update download URL
Update for Firefox 18
Merge branch 'master' of github.com:zotero/zotero-word-for-windows-integration

Conflicts:
	update.rdf
Update versions
Change paths to point to Office 2010
Workaround for Word 2013 bug (only built for Firefox 17 and 18)
Build for Firefox 19 and 20
Merge branch 'master' into js-ctypes

Conflicts:
	build/zoteroWinWordIntegration/zoteroException.cpp
	build/zoteroWinWordIntegration/zoteroIntegration.h
	build/zoteroWinWordIntegration/zoteroWinWordField.cpp
	build/zoteroWinWordIntegration/zoteroWinWordIntegration.sln
	build/zoteroWinWordIntegration/zoteroWinWordIntegration.suo
	chrome.manifest
	install.rdf
	update.rdf