latest changes
Merge branch 'master' of https://github.com/Hackathon-Team-Prototype/whiteboard

Conflicts:
	app.js
	app/controller/Editor.js
	app/controller/Meeting.js
	app/controller/WhiteboardPanelController.js
	app/view/MeetingTabs.js