Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into creating-better-templates

Conflicts:
	labs/meteor-client/client/globals.coffee
	labs/meteor-client/client/main.coffee
	labs/meteor-client/client/views/whiteboard/whiteboard.html
	labs/meteor-client/client/whiteboard_models/whiteboard_paper.coffee
working on clearing all shapes from a slide
working on handling slow drawing of shapes
now we only draw on DRAW_END - no more fuzzy shapes on the html5 whiteboard due to slow drawing
Added recording status and matching icons
Drawing triangles on whiteboard
Drawing lines on whiteboard
Drawing ellipses
Fixed overflowing messages, and navbar
Fixed some UI overflowing issues
removing single shape and removing all shapes from slide
fix drawListOfShapes(shapes) and some cleaning up
cleaning up and minor fix to slideshow error - whiteboard_paper's last function which is still under development
Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into creating-better-templates

Conflicts:
	labs/meteor-client/client/globals.coffee
	labs/meteor-client/client/main.coffee
	labs/meteor-client/client/views/whiteboard/whiteboard.html
	labs/meteor-client/client/whiteboard_models/whiteboard_paper.coffee
Merge branch 'more-whiteboard-shapes' of https://github.com/lfzawacki/bigbluebutton into creating-better-templates
Fixed ,ajor issues with duplication of button handler preventing audio calls from being made
Removed duplicate bootstrap packages, fixing up UI issues now to compensate
You can now change the font size of messages in the options bar
Options now shows currently used font size
Merge remote-tracking branch 'anton/creating-better-templates' into creating-better-templates

Conflicts:
	labs/meteor-client/client/main.coffee