Updated for new file-collection v0.3 and Meteor v0.9
Merge branch 'v0.3-test'

Conflicts:
	.meteor/.id