remove and add strings for the localization file
 - allow removing of close button for avatar and publish window through config.xml
 - reset videoHolder dimensions and position to display properly when user publish,stop, then publish webcam
Revert " - allow removing of close button for avatar and publish window through config.xml"

This reverts commit 961626f46a3e5db0b0e16056742bfec8c5642732.
 - allow removing of close button from config.xml
Merge remote branch 'upstream/master'

Conflicts:
	bbb-api-demo/src/main/webapp/bbb_api.jsp
	bigbluebutton-client/locale/en_US/bbbResources.properties
Merge remote branch 'origin/master'

Conflicts:
	bbb-api-demo/src/main/webapp/bbb_api.jsp