update again
Merge branch 'master' of github.com:yoyocicada/multivision-barebone

Conflicts:
	server/utilities/commonFunctions.js