Merge branch 'dev'
Merge branch 'dev'
Fixed description
Renamed internals
Always call the init hook
Merge branch 'master' into dev

Conflicts:
	example/.meteor/versions