Events models, views and controller
Events models, views and controller
ignore workspace.xml
resolve events branch conflict