crlf
Merge branch 'master' into stable

Conflicts:
	.gitattributes
Updating version
Fixing id generation
Fixing build script
Better build number detection
If using the default oauth token, we will use the request's host & port, rather than rely on the user to specify them for us.
Avoid locks for lucene index input
Do not rely on the delete marker when deciding when to use etag and when not to.
/databases is not a non secret url.
Fixing merge