merge upstream master and add video,audio settings
add css to camera and audio settings
manage visibility of backbtn and profilebtn
implement UI new design
Merge branch 'add-videoaudio-settings-view' of https://github.com/SenecaCDOT-BigBlueButton/bbb-air-client into edit-styles

Conflicts:
	src/Default.css
	src/Main.mxml
	src/assets/res/drawable-xxxhdpi/SwapCamera_up.png
	src/locale/en_US/resources.properties
	src/org/bigbluebutton/view/navigation/pages/chatrooms/ChatRoomsViewMediator.as
	src/org/bigbluebutton/view/navigation/pages/participants/ParticipantItemRenderer.mxml
	src/org/bigbluebutton/view/navigation/pages/participants/ParticipantsViewMediator.as
	src/org/bigbluebutton/view/navigation/pages/profile/ProfileViewBase.mxml
	src/org/bigbluebutton/view/navigation/pages/userdetails/UserDetaisViewBase.mxml
	src/org/bigbluebutton/view/navigation/pages/videochat/VideoChatViewBase.mxml
modify UI color, font
remove commented out code
Merge branch 'master' of https://github.com/bigbluebutton/bbb-air-client into edit-styles

Conflicts:
	src/org/bigbluebutton/view/navigation/pages/login/LoginPageViewBase.mxml
change UI to meet raise hand functionality in 0.9
remove unnecessary group
Merge pull request #44 from SenecaCDOT-BigBlueButton/edit-styles

implement new UI styles