model
Merge branch 'master' of github.com:neonsamurai/events into add-simple-events

Conflicts:
	.meteor/packages
adds saving of simple events