reversion
	modified:   app.js
	modified:   apps/mongo/db.js
	deleted:    apps/socket.io/server.js
	modified:   package.json
	modified:   public/js/boot.js
	modified:   public/js/views/ScheduleView.js
	modified:   public/js/views/index.js
	modified:   public/styles/css/main.css
	modified:   public/styles/sass/partials/_global.sass
	modified:   public/styles/sass/partials/_schedule.sass
	modified:   views/index.jade
roundtables viewable in one event slot
	modified:   apps/mongo/db.js
	modified:   public/js/views/ScheduleView.js
	modified:   public/styles/css/main.css
	modified:   public/styles/sass/partials/_schedule.sass
	modified:   public/templates/eventTemplate.html
Merge branch 'develop' of https://github.com/thebeansgroup/liveboard into develop

Conflicts:
	app.js

Set as local development
	modified:   app.js