extended events model
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/models/event1.server.model.js