Added Yawp's annotations.
Merge pull request #1 from pilgrimagesoftware/master

Yawp annotations
Create org.xmpp.presence.md
Merge pull request #2 from swhitley/master

Request to add org.xmpp.presence
Update annotations/net.app.core.directory.twitter.md

Twitter user ids should be supported as well as usernames, as people change their usernames more often than you'd think, and it's trivial to look up an account's current username given its id.
Add fallback url annotation
Add channel invite annotation
Update language
Remove validation warnings (now live)
Add annotation replacement values and attachments
Add url_expires value
Added voting Annotation
Merge pull request #3 from frankieroberto/patch-1

Update annotations/net.app.core.directory.twitter.md
Revert "Merge pull request #3 from frankieroberto/patch-1"

This reverts commit 36ac9e33eb430846bef7919af3f86d81055efa91, reversing
changes made to 03ffc8a5e3abc0e933cd9d640396664c4e7820cf.
Merge pull request #5 from MisterPoppet/master

Voting Annotation
Merge branch 'master' of github.com:appdotnet/object-metadata
Add links to File documentation; cleanup
First revision of the main pieces of the Patter protocol.
Merge remote-tracking branch 'orian/master'

Conflicts:
	annotations/net.app.core.oembed.md