node-soft-mirror integration
bumping mirror version
merging master
bumping soft-mirror and velocity versions
Merges soft-mirror usage into master
bumping noe-soft-mirror version
Merge branch 'soft-mirror'

Conflicts:
	package.js
	versions.json
Merge branch 'master' into server-integration

Conflicts:
	client/integration/ClientIntegrationTestFramework.js
	package.js
	registerFrameworks.js
Fixes for server integration mode for using the new soft-mirror
Insert mirror iFrame when mirror is ready