Update to 0.9
Merge branch 'utwente' into meteor101

Conflicts:
	.meteor/.id
	.meteor/versions