Update dev dependencies
Remove superfluous semicolons
Merge branch 'master' into uitests

Conflicts:
	package.json