set versions for some things
Merge branch 'master' into master-opower

Conflicts:
	package.json