update metadata function WIP
Merge branch 'master' into jseip1679

Conflicts:
	client/peerSetup.js
merge resolution
folder cleanup
updated naming convention for startPeerConnection  aka initiatePeerConnection