fix- drawdeviceFactory test breaking
.add timeStamp to each test run
Merge branch 'initialCanvas' of https://github.com/jitterbugboy/draw2gether into initialCanvas

Conflicts:
	src/components/drawingTools/Pen.js
	src/core/CanvasElement.js
	src/factory/DrawDevicesFactory.js
	test/factory/DrawDevicesFactorySpec.js
	test/test-main.js