- style fileupload window
 - continue styling file upload window
 - handle delete presentation from file upload windo
 - style mic settings
 - fix cancel button position
 - show only progress bar when uploading
 - turn off horizontal and vertical scrollbars when viewing webcam
 - update default BBB style
Merge branch 'master' into style-presentation-upload-window

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton