Update Meteor version
Merge branch 'develop' of github.com:Q42/q42.nl into develop

Conflicts:
	.meteor/.id
	.meteor/versions
Update to Meteor 0.9.1
Fix for reserved template name
Fix prettyprinted code
Fix code syntax highlighting