Added a server.js test page and more event creation functionality
bits and pieces
Fixed merge conflicts