modified local settings to be able to run on my system
merged latest with my local changes
HTML5: Set specific versions for the dependencies

It's always better to have specific version to force all instances to
use exactly the same dependencies and avoid errors that will naturally
happen when libs are updated.
Also restricted the version of node to 0.10.x.
HTML5: Update jade to 0.34.1 and remove warnings

Removed the warnings:
"Implicit textOnly for `script` and `style` is deprecated.  Use `script.` or `style.` instead."
Merge pull request #232 from daronco/html5-bridge-packages

Set specific versions for the HTML5 client's dependencies
slide size hotfix
ellipse tool can now draw prefect circle in html5 client
Merge pull request #239 from mohamed-ahmed/html5-bridge

Html5 bridge
Merge remote-tracking branch 'upstream/html5-bridge' into html5-bridge-server-refactor

Conflicts:
	labs/bbb-html5-client/package.json