Moved javascript to its own library
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	Canvas.html