Merge branch 'master' of https://github.com/okamstudio/godot

scene/gui/file_dialog.cpp

@@ -49,7 +49,7 @@ void FileDialog::_notification(int p_what) {
 
 	if (p_what==NOTIFICATION_ENTER_TREE) {
 
-		refresh->set_icon(get_icon("Reload","EditorIcons"));
+		refresh->set_icon(get_icon("reload"));
 	}
 	
 	if (p_what==NOTIFICATION_DRAW) {

scene/gui/video_player.cpp

@@ -271,6 +271,7 @@ void VideoPlayer::set_paused(bool p_paused) {
 		playback->set_paused(p_paused);
 		set_process(!p_paused);
 	};
+	last_audio_time = 0;
 };
 
 bool VideoPlayer::is_paused() const {

scene/resources/default_theme/default_theme.cpp

@@ -543,7 +543,11 @@ void make_default_theme() {
 	t->set_constant("close_v_ofs","WindowDialog", 20 );
 	t->set_constant("titlebar_height","WindowDialog", 18 );
 	t->set_constant("title_height","WindowDialog", 20 );
-
+	
+	
+	// File Dialog
+	
+	t->set_icon("reload","FileDialog",make_icon( icon_reload_png ));
 
 
 	// Popup