diff --git a/SConstruct b/SConstruct
index 9cd1da7f458..9cce6edd812 100644
--- a/SConstruct
+++ b/SConstruct
@@ -220,14 +220,14 @@ if selected_platform in platform_list:
 
 	env.Append(LINKFLAGS=string.split(str(LINKFLAGS)))
 
-	detect.configure(env)
-
-
 	flag_list = platform_flags[selected_platform]
 	for f in flag_list:
 		if not (f[0] in ARGUMENTS): # allow command line to override platform flags
 			env[f[0]] = f[1]
 
+	#must happen after the flags, so when flags are used by configure, stuff happens (ie, ssl on x11)
+	detect.configure(env)
+
         #env['platform_libsuffix'] = env['LIBSUFFIX']
 
 	suffix="."+selected_platform
diff --git a/core/error_list.h b/core/error_list.h
index 124027172e2..92c417154ce 100644
--- a/core/error_list.h
+++ b/core/error_list.h
@@ -54,6 +54,7 @@ enum Error {
 	ERR_FILE_CANT_READ,
 	ERR_FILE_UNRECOGNIZED, // (15)
 	ERR_FILE_CORRUPT,
+	ERR_FILE_MISSING_DEPENDENCIES,
 	ERR_FILE_EOF,
 	ERR_CANT_OPEN, ///< Can't open a resource/socket/file
 	ERR_CANT_CREATE,
diff --git a/core/error_macros.h b/core/error_macros.h
index 18b08d8e0ee..76da88287bb 100644
--- a/core/error_macros.h
+++ b/core/error_macros.h
@@ -104,7 +104,7 @@ extern bool _err_error_exists;
 
 #define ERR_FAIL_INDEX(m_index,m_size) \
 	 do {if ((m_index)<0 || (m_index)>=(m_size)) { \
-		_err_print_error(FUNCTION_STR,__FILE__,__LINE__,"Index "_STR(m_index)" out of size ("_STR(m_size)").");	\
+        _err_print_error(FUNCTION_STR,__FILE__,__LINE__,"Index " _STR(m_index)" out of size (" _STR(m_size)").");	\
 		return;	\
 	} else _err_error_exists=false; } while(0);	\
 
@@ -115,7 +115,7 @@ extern bool _err_error_exists;
 
 #define ERR_FAIL_INDEX_V(m_index,m_size,m_retval) \
 	 do {if ((m_index)<0 || (m_index)>=(m_size)) { \
-		_err_print_error(FUNCTION_STR,__FILE__,__LINE__,"Index "_STR(m_index)" out of size ("_STR(m_size)").");	\
+        _err_print_error(FUNCTION_STR,__FILE__,__LINE__,"Index " _STR(m_index)" out of size (" _STR(m_size)").");	\
 		return m_retval;	 \
 	} else _err_error_exists=false;} while (0);
 
@@ -125,14 +125,14 @@ extern bool _err_error_exists;
 
  #define ERR_FAIL_NULL(m_param) \
 	 { if ( !m_param ) {	\
-		 _err_print_error(FUNCTION_STR,__FILE__,__LINE__,"Parameter ' "_STR(m_param)" ' is null.");	\
+         _err_print_error(FUNCTION_STR,__FILE__,__LINE__,"Parameter ' " _STR(m_param)" ' is null.");	\
 		 return;	 \
 	 }else _err_error_exists=false; }	\
 
 
 #define ERR_FAIL_NULL_V(m_param,m_retval) \
 	{ if ( !m_param ) {	\
-		_err_print_error(FUNCTION_STR,__FILE__,__LINE__,"Parameter ' "_STR(m_param)" ' is null.");	\
+        _err_print_error(FUNCTION_STR,__FILE__,__LINE__,"Parameter ' " _STR(m_param)" ' is null.");	\
 		return m_retval;	 \
 	}else _err_error_exists=false; }	\
 
@@ -142,7 +142,7 @@ extern bool _err_error_exists;
 
 #define ERR_FAIL_COND(m_cond) \
 	{ if ( m_cond ) {	\
-		_err_print_error(FUNCTION_STR,__FILE__,__LINE__,"Condition ' "_STR(m_cond)" ' is true.");	\
+        _err_print_error(FUNCTION_STR,__FILE__,__LINE__,"Condition ' " _STR(m_cond)" ' is true.");	\
 		return;	 \
 	}else _err_error_exists=false; }	\
 
@@ -154,7 +154,7 @@ extern bool _err_error_exists;
 
 #define ERR_FAIL_COND_V(m_cond,m_retval) \
 	{ if ( m_cond ) {	\
-		_err_print_error(FUNCTION_STR,__FILE__,__LINE__,"Condition ' "_STR(m_cond)" ' is true. returned: "_STR(m_retval));	\
+        _err_print_error(FUNCTION_STR,__FILE__,__LINE__,"Condition ' " _STR(m_cond)" ' is true. returned: " _STR(m_retval));	\
 		return m_retval;	 \
 	}else _err_error_exists=false; }	\
 
@@ -164,7 +164,7 @@ extern bool _err_error_exists;
 
 #define ERR_CONTINUE(m_cond) \
 	{ if ( m_cond ) {	\
-		_err_print_error(FUNCTION_STR,__FILE__,__LINE__,"Condition ' "_STR(m_cond)" ' is true. Continuing..:");	\
+        _err_print_error(FUNCTION_STR,__FILE__,__LINE__,"Condition ' " _STR(m_cond)" ' is true. Continuing..:");	\
 		continue;\
 	} else _err_error_exists=false;}	\
 
@@ -174,7 +174,7 @@ extern bool _err_error_exists;
 
 #define ERR_BREAK(m_cond) \
 	{ if ( m_cond ) {	\
-		_err_print_error(FUNCTION_STR,__FILE__,__LINE__,"Condition ' "_STR(m_cond)" ' is true. Breaking..:");	\
+        _err_print_error(FUNCTION_STR,__FILE__,__LINE__,"Condition ' " _STR(m_cond)" ' is true. Breaking..:");	\
 		break;\
 	} else _err_error_exists=false;}	\
 
@@ -193,7 +193,7 @@ extern bool _err_error_exists;
 
 #define ERR_FAIL_V(m_value) \
 { \
-		_err_print_error(FUNCTION_STR,__FILE__,__LINE__,"Method/Function Failed, returning: "__STR(m_value));	\
+        _err_print_error(FUNCTION_STR,__FILE__,__LINE__,"Method/Function Failed, returning: " __STR(m_value));	\
 		_err_error_exists=false;	\
 		return m_value;\
 } \
diff --git a/core/global_constants.cpp b/core/global_constants.cpp
index b8d113f67c7..9fb45c672a8 100644
--- a/core/global_constants.cpp
+++ b/core/global_constants.cpp
@@ -422,6 +422,7 @@ static _GlobalConstant _global_constants[]={
 	BIND_GLOBAL_CONSTANT( ERR_FILE_CANT_READ ),
 	BIND_GLOBAL_CONSTANT( ERR_FILE_UNRECOGNIZED ),
 	BIND_GLOBAL_CONSTANT( ERR_FILE_CORRUPT ),
+	BIND_GLOBAL_CONSTANT( ERR_FILE_MISSING_DEPENDENCIES),
 	BIND_GLOBAL_CONSTANT( ERR_FILE_EOF ),
 	BIND_GLOBAL_CONSTANT( ERR_CANT_OPEN ), ///< Can't open a resource/socket/file
 	BIND_GLOBAL_CONSTANT( ERR_CANT_CREATE ),
diff --git a/core/globals.cpp b/core/globals.cpp
index 731c5b7dff1..ffd4cf5d5e7 100644
--- a/core/globals.cpp
+++ b/core/globals.cpp
@@ -54,7 +54,7 @@ String Globals::localize_path(const String& p_path) const {
 	if (resource_path=="")
 		return p_path; //not initialied yet
 
-	if (p_path.begins_with("res://"))
+	if (p_path.find(":/") != -1)
 		return p_path.simplify_path();
 
 
@@ -1477,7 +1477,6 @@ Globals::Globals() {
 	custom_prop_info["render/mipmap_policy"]=PropertyInfo(Variant::INT,"render/mipmap_policy",PROPERTY_HINT_ENUM,"Allow,Allow For Po2,Disallow");
 	custom_prop_info["render/thread_model"]=PropertyInfo(Variant::INT,"render/thread_model",PROPERTY_HINT_ENUM,"Single-Unsafe,Single-Safe,Multi-Threaded");
 	custom_prop_info["physics_2d/thread_model"]=PropertyInfo(Variant::INT,"physics_2d/thread_model",PROPERTY_HINT_ENUM,"Single-Unsafe,Single-Safe,Multi-Threaded");
-	set("display/emulate_touchscreen",false);
 
 	using_datapack=false;
 }
diff --git a/core/io/compression.cpp b/core/io/compression.cpp
index 0bc006b41e9..729b7bec52c 100644
--- a/core/io/compression.cpp
+++ b/core/io/compression.cpp
@@ -26,12 +26,12 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
+#include "zlib.h"
+#include "os/copymem.h"
 #include "compression.h"
 
 #include "fastlz.h"
-#include "zlib.h"
 #include "zip_io.h"
-#include "os/copymem.h"
 
 int Compression::compress(uint8_t *p_dst, const uint8_t *p_src, int p_src_size,Mode p_mode) {
 
diff --git a/core/io/image_loader.cpp b/core/io/image_loader.cpp
index d3390ae1999..2db6e00f0a6 100644
--- a/core/io/image_loader.cpp
+++ b/core/io/image_loader.cpp
@@ -50,8 +50,10 @@ Error ImageLoader::load_image(String p_file,Image *p_image, FileAccess *p_custom
 	if (!f) {
 		Error err;
 		f=FileAccess::open(p_file,FileAccess::READ,&err);
-		if (!f)
+		if (!f) {
+			print_line("ERROR OPENING FILE: "+p_file);
 			return err;
+		}
 	}
 				
 	String extension = p_file.extension();
@@ -62,15 +64,20 @@ Error ImageLoader::load_image(String p_file,Image *p_image, FileAccess *p_custom
 		if (!loader[i]->recognize(extension))
 			continue;
 		Error err = loader[i]->load_image(p_image,f);
+
 		if (err!=ERR_FILE_UNRECOGNIZED) {
+
+
 			if (!p_custom)
 				memdelete(f);
+
 			return err;
 		}
 			
 		
 	}
-	
+	print_line("NO LOADER?");
+
 	if (!p_custom)
 		memdelete(f);	
 		
diff --git a/core/io/ioapi.h b/core/io/ioapi.h
index a13d7ba621b..24bf6126176 100644
--- a/core/io/ioapi.h
+++ b/core/io/ioapi.h
@@ -40,7 +40,6 @@
 #endif
 
 #include <stdio.h>
-#include <stdlib.h>
 #include "zlib.h"
 
 #if defined(USE_FILE32API)
diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp
index c6cf631de61..60bb8b658eb 100644
--- a/core/io/resource_format_binary.cpp
+++ b/core/io/resource_format_binary.cpp
@@ -31,6 +31,7 @@
 #include "globals.h"
 #include "io/file_access_compressed.h"
 #include "io/marshalls.h"
+#include "os/dir_access.h"
 //#define print_bl(m_what) print_line(m_what)
 #define print_bl(m_what)
 
@@ -99,7 +100,9 @@ enum {
 	OBJECT_EMPTY=0,
 	OBJECT_EXTERNAL_RESOURCE=1,
 	OBJECT_INTERNAL_RESOURCE=2,
-	FORMAT_VERSION=0
+	OBJECT_EXTERNAL_RESOURCE_INDEX=3,
+	FORMAT_VERSION=1,
+	FORMAT_VERSION_CAN_RENAME_DEPS=1
 
 
 };
@@ -375,7 +378,7 @@ Error ResourceInteractiveLoaderBinary::parse_variant(Variant& r_v)  {
 				} break;
 				case OBJECT_INTERNAL_RESOURCE: {
 					uint32_t index=f->get_32();
-					String path = res_path+"::"+itos(index);
+					String path = res_path+"::"+itos(index);					
 					RES res = ResourceLoader::load(path);
 					if (res.is_null()) {
 						WARN_PRINT(String("Couldn't load resource: "+path).utf8().get_data());
@@ -384,6 +387,7 @@ Error ResourceInteractiveLoaderBinary::parse_variant(Variant& r_v)  {
 
 				} break;
 				case OBJECT_EXTERNAL_RESOURCE: {
+					//old file format, still around for compatibility
 
 					String type = get_unicode_string();
 					String path = get_unicode_string();
@@ -394,6 +398,10 @@ Error ResourceInteractiveLoaderBinary::parse_variant(Variant& r_v)  {
 
 					}
 
+					if (remaps.find(path)) {
+						path=remaps[path];
+					}
+
 					RES res=ResourceLoader::load(path,type);
 
 					if (res.is_null()) {
@@ -401,6 +409,34 @@ Error ResourceInteractiveLoaderBinary::parse_variant(Variant& r_v)  {
 					}
 					r_v=res;
 
+				} break;
+				case OBJECT_EXTERNAL_RESOURCE_INDEX: {
+					//new file format, just refers to an index in the external list
+					uint32_t erindex = f->get_32();
+
+					if (erindex>=external_resources.size()) {
+						WARN_PRINT("Broken external resource! (index out of size");
+						r_v=Variant();
+					} else {
+
+						String type = external_resources[erindex].type;
+						String path = external_resources[erindex].path;
+
+						if (path.find("://")==-1 && path.is_rel_path()) {
+							// path is relative to file being loaded, so convert to a resource path
+							path=Globals::get_singleton()->localize_path(res_path.get_base_dir().plus_file(path));
+
+						}
+
+						RES res=ResourceLoader::load(path,type);
+
+						if (res.is_null()) {
+							WARN_PRINT(String("Couldn't load resource: "+path).utf8().get_data());
+						}
+						r_v=res;
+					}
+
+
 				} break;
 				default: {
 
@@ -628,17 +664,20 @@ Error ResourceInteractiveLoaderBinary::poll(){
 
 	if (s<external_resources.size()) {
 
-		RES res = ResourceLoader::load(external_resources[s].path,external_resources[s].type);
+		String path = external_resources[s].path;
+		if (remaps.has(path)) {
+			path=remaps[path];
+		}
+		RES res = ResourceLoader::load(path,external_resources[s].type);
 		if (res.is_null()) {
 
 			if (!ResourceLoader::get_abort_on_missing_resources()) {
 
-				ResourceLoader::notify_load_error("Resource Not Found: "+external_resources[s].path);
+				ResourceLoader::notify_dependency_error(local_path,path,external_resources[s].type);
 			} else {
 
-
-				error=ERR_FILE_CORRUPT;
-				ERR_EXPLAIN("Can't load dependency: "+external_resources[s].path);
+				error=ERR_FILE_MISSING_DEPENDENCIES;
+				ERR_EXPLAIN("Can't load dependency: "+path);
 				ERR_FAIL_V(error);
 			}
 
@@ -787,6 +826,27 @@ int ResourceInteractiveLoaderBinary::get_stage_count() const {
 	return external_resources.size()+internal_resources.size();
 }
 
+
+static void save_ustring(FileAccess* f,const String& p_string) {
+
+
+	CharString utf8 = p_string.utf8();
+	f->store_32(utf8.length()+1);
+	f->store_buffer((const uint8_t*)utf8.get_data(),utf8.length()+1);
+}
+
+
+static String get_ustring(FileAccess *f) {
+
+	int len = f->get_32();
+	Vector<char> str_buf;
+	str_buf.resize(len);
+	f->get_buffer((uint8_t*)&str_buf[0],len);
+	String s;
+	s.parse_utf8(&str_buf[0]);
+	return s;
+}
+
 String ResourceInteractiveLoaderBinary::get_unicode_string() {
 
 	int len = f->get_32();
@@ -801,7 +861,7 @@ String ResourceInteractiveLoaderBinary::get_unicode_string() {
 
 
 
-void ResourceInteractiveLoaderBinary::get_dependencies(FileAccess *p_f,List<String> *p_dependencies) {
+void ResourceInteractiveLoaderBinary::get_dependencies(FileAccess *p_f,List<String> *p_dependencies,bool p_add_types) {
 
 	open(p_f);
 	if (error)
@@ -814,6 +874,10 @@ void ResourceInteractiveLoaderBinary::get_dependencies(FileAccess *p_f,List<Stri
 			dep=ResourceLoader::guess_full_filename(dep,external_resources[i].type);
 		}
 
+		if (p_add_types && external_resources[i].type!=String()) {
+			dep+="::"+external_resources[i].type;
+		}
+
 		p_dependencies->push_back(dep);
 	}
 
@@ -866,7 +930,7 @@ void ResourceInteractiveLoaderBinary::open(FileAccess *p_f) {
 	print_bl("minor: "+itos(ver_minor));
 	print_bl("format: "+itos(ver_format));
 
-	if (ver_format<FORMAT_VERSION ||  ver_major>VERSION_MAJOR) {
+	if (ver_format>FORMAT_VERSION ||  ver_major>VERSION_MAJOR) {
 
 		f->close();
 		ERR_EXPLAIN("File Format '"+itos(FORMAT_VERSION)+"."+itos(ver_major)+"."+itos(ver_minor)+"' is too new! Please upgrade to a a new engine version: "+local_path);
@@ -903,6 +967,7 @@ void ResourceInteractiveLoaderBinary::open(FileAccess *p_f) {
 	}
 
 	//see if the exporter has different set of external resources for more efficient loading
+	/*
 	String preload_depts = "deps/"+res_path.md5_text();
 	if (Globals::get_singleton()->has(preload_depts)) {
 		external_resources.clear();
@@ -913,7 +978,7 @@ void ResourceInteractiveLoaderBinary::open(FileAccess *p_f) {
 			external_resources[i].path=depts.get_name(i);
 		}
 		print_line(res_path+" - EXTERNAL RESOURCES: "+itos(external_resources.size()));
-	}
+	}*/
 
 	print_bl("ext resources: "+itos(ext_resources_size));
 	uint32_t int_resources_size=f->get_32();
@@ -973,7 +1038,7 @@ String ResourceInteractiveLoaderBinary::recognize(FileAccess *p_f) {
 	uint32_t ver_minor=f->get_32();
 	uint32_t ver_format=f->get_32();
 
-	if (ver_format<FORMAT_VERSION ||  ver_major>VERSION_MAJOR) {
+	if (ver_format>FORMAT_VERSION ||  ver_major>VERSION_MAJOR) {
 
 		f->close();
 		return "";
@@ -1000,8 +1065,10 @@ ResourceInteractiveLoaderBinary::~ResourceInteractiveLoaderBinary() {
 }
 
 
-Ref<ResourceInteractiveLoader> ResourceFormatLoaderBinary::load_interactive(const String &p_path) {
+Ref<ResourceInteractiveLoader> ResourceFormatLoaderBinary::load_interactive(const String &p_path, Error *r_error) {
 
+	if (r_error)
+		*r_error=ERR_FILE_CANT_OPEN;
 
 	Error err;
 	FileAccess *f = FileAccess::open(p_path,FileAccess::READ,&err);
@@ -1114,7 +1181,7 @@ Error ResourceFormatLoaderBinary::load_import_metadata(const String &p_path, Ref
 }
 
 
-void ResourceFormatLoaderBinary::get_dependencies(const String& p_path,List<String> *p_dependencies) {
+void ResourceFormatLoaderBinary::get_dependencies(const String& p_path,List<String> *p_dependencies,bool p_add_types) {
 
 	FileAccess *f = FileAccess::open(p_path,FileAccess::READ);
 	ERR_FAIL_COND(!f);
@@ -1123,7 +1190,217 @@ void ResourceFormatLoaderBinary::get_dependencies(const String& p_path,List<Stri
 	ria->local_path=Globals::get_singleton()->localize_path(p_path);
 	ria->res_path=ria->local_path;
 //	ria->set_local_path( Globals::get_singleton()->localize_path(p_path) );
-	ria->get_dependencies(f,p_dependencies);
+	ria->get_dependencies(f,p_dependencies,p_add_types);
+}
+
+Error ResourceFormatLoaderBinary::rename_dependencies(const String &p_path,const Map<String,String>& p_map) {
+
+
+//	Error error=OK;
+
+
+	FileAccess *f=FileAccess::open(p_path,FileAccess::READ);
+	ERR_FAIL_COND_V(!f,ERR_CANT_OPEN);
+
+	FileAccess* fw=NULL;//=FileAccess::open(p_path+".depren");
+
+	String local_path=p_path.get_base_dir();
+
+	uint8_t header[4];
+	f->get_buffer(header,4);
+	if (header[0]=='R' && header[1]=='S' && header[2]=='C' && header[3]=='C') {
+		//compressed
+		FileAccessCompressed *fac = memnew( FileAccessCompressed );
+		fac->open_after_magic(f);
+		f=fac;
+
+		FileAccessCompressed *facw = memnew( FileAccessCompressed );
+		facw->configure("RSCC");
+		Error err = facw->_open(p_path+".depren",FileAccess::WRITE);
+		if (err) {
+			memdelete(fac);
+			memdelete(facw);
+			ERR_FAIL_COND_V(err,ERR_FILE_CORRUPT);
+		}
+
+		fw=facw;
+
+
+	} else if (header[0]!='R' || header[1]!='S' || header[2]!='R' || header[3]!='C') {
+		//not normal
+
+		//error=ERR_FILE_UNRECOGNIZED;
+		memdelete(f);
+		ERR_EXPLAIN("Unrecognized binary resource file: "+local_path);
+		ERR_FAIL_V(ERR_FILE_UNRECOGNIZED);
+	} else {
+		fw = FileAccess::open(p_path+".depren",FileAccess::WRITE);
+		if (!fw) {
+			memdelete(f);
+		}
+		ERR_FAIL_COND_V(!fw,ERR_CANT_CREATE);
+	}
+
+	bool big_endian = f->get_32();
+#ifdef BIG_ENDIAN_ENABLED
+	endian_swap = !big_endian;
+#else
+	bool endian_swap = big_endian;
+#endif
+
+	bool use_real64 = f->get_32();
+
+	f->set_endian_swap(big_endian!=0); //read big endian if saved as big endian
+	fw->store_32(endian_swap);
+	fw->set_endian_swap(big_endian!=0);
+	fw->store_32(use_real64); //use real64
+
+	uint32_t ver_major=f->get_32();
+	uint32_t ver_minor=f->get_32();
+	uint32_t ver_format=f->get_32();
+
+	if (ver_format<FORMAT_VERSION_CAN_RENAME_DEPS) {
+
+		memdelete(f);
+		memdelete(fw);
+		DirAccess *da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
+		da->remove(p_path+".depren");
+		memdelete(da);
+		//fuck it, use the old approach;
+
+		WARN_PRINT(("This file is old, so it can't refactor dependencies, opening and resaving: "+p_path).utf8().get_data());
+
+		Error err;
+		f = FileAccess::open(p_path,FileAccess::READ,&err);
+		if (err!=OK) {
+			ERR_FAIL_COND_V(err!=OK,ERR_FILE_CANT_OPEN);
+		}
+
+		Ref<ResourceInteractiveLoaderBinary> ria = memnew( ResourceInteractiveLoaderBinary );
+		ria->local_path=Globals::get_singleton()->localize_path(p_path);
+		ria->res_path=ria->local_path;
+		ria->remaps=p_map;
+	//	ria->set_local_path( Globals::get_singleton()->localize_path(p_path) );
+		ria->open(f);
+
+		err = ria->poll();
+
+		while(err==OK) {
+			err=ria->poll();
+		}
+
+		ERR_FAIL_COND_V(err!=ERR_FILE_EOF,ERR_FILE_CORRUPT);
+		RES res = ria->get_resource();
+		ERR_FAIL_COND_V(!res.is_valid(),ERR_FILE_CORRUPT);
+
+		return ResourceFormatSaverBinary::singleton->save(p_path,res);
+	}
+
+	if (ver_format>FORMAT_VERSION ||  ver_major>VERSION_MAJOR) {
+
+		memdelete(f);
+		memdelete(fw);
+		ERR_EXPLAIN("File Format '"+itos(FORMAT_VERSION)+"."+itos(ver_major)+"."+itos(ver_minor)+"' is too new! Please upgrade to a a new engine version: "+local_path);
+		ERR_FAIL_V(ERR_FILE_UNRECOGNIZED);
+
+	}
+
+	fw->store_32( VERSION_MAJOR ); //current version
+	fw->store_32( VERSION_MINOR );
+	fw->store_32( FORMAT_VERSION );
+
+	save_ustring(fw,get_ustring(f)); //type
+
+
+	size_t md_ofs = f->get_pos();
+	size_t importmd_ofs = f->get_64();
+	fw->store_64(0); //metadata offset
+
+	for(int i=0;i<14;i++) {
+		fw->store_32(0);
+		f->get_32();
+	}
+
+	//string table
+	uint32_t string_table_size=f->get_32();
+
+	fw->store_32(string_table_size);
+
+	for(uint32_t i=0;i<string_table_size;i++) {
+
+		String s = get_ustring(f);
+		save_ustring(fw,s);
+	}
+
+	//external resources
+	uint32_t ext_resources_size=f->get_32();
+	fw->store_32(ext_resources_size);
+	for(uint32_t i=0;i<ext_resources_size;i++) {
+
+		String type = get_ustring(f);
+		String path = get_ustring(f);
+
+		bool relative=false;
+		if (!path.begins_with("res://")) {
+			path=local_path.plus_file(path).simplify_path();
+			relative=true;
+		}
+
+
+		if (p_map.has(path)) {
+			String np=p_map[path];
+			path=np;
+		}
+
+		if (relative) {
+			//restore relative
+			path=local_path.path_to_file(path);
+		}
+
+		save_ustring(fw,type);
+		save_ustring(fw,path);
+	}
+
+	int64_t size_diff = (int64_t)fw->get_pos() - (int64_t)f->get_pos();
+
+	//internal resources
+	uint32_t int_resources_size=f->get_32();
+	fw->store_32(int_resources_size);
+
+	for(uint32_t i=0;i<int_resources_size;i++) {
+
+
+		String path=get_ustring(f);
+		uint64_t offset=f->get_64();
+		save_ustring(fw,path);
+		fw->store_64(offset+size_diff);
+	}
+
+	//rest of file
+	uint8_t b = f->get_8();
+	while(!f->eof_reached()) {
+		fw->store_8(b);
+		b = f->get_8();
+	}
+
+	bool all_ok = fw->get_error()==OK;
+
+	fw->seek(md_ofs);
+	fw->store_64(importmd_ofs+size_diff);
+
+
+	memdelete(f);
+	memdelete(fw);
+
+	if (!all_ok) {
+		return ERR_CANT_CREATE;
+	}
+
+	DirAccess *da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
+	da->remove(p_path);
+	da->rename(p_path+".depren",p_path);
+	memdelete(da);
+	return OK;
 }
 
 
@@ -1433,10 +1710,8 @@ void ResourceFormatSaverBinaryInstance::write_variant(const Variant& p_property,
 			}
 
 			if (res->get_path().length() && res->get_path().find("::")==-1) {
-				f->store_32(OBJECT_EXTERNAL_RESOURCE);
-				save_unicode_string(res->get_save_type());
-				String path=relative_paths?local_path.path_to_file(res->get_path()):res->get_path();
-				save_unicode_string(path);
+				f->store_32(OBJECT_EXTERNAL_RESOURCE_INDEX);
+				f->store_32(external_resources[res]);
 			} else {
 
 				if (!resource_set.has(res)) {
@@ -1594,11 +1869,12 @@ void ResourceFormatSaverBinaryInstance::_find_resources(const Variant& p_variant
 
 			RES res = p_variant.operator RefPtr();
 
-			if (res.is_null())
+			if (res.is_null() || external_resources.has(res))
 				return;
 
 			if (!p_main && (!bundle_resources ) && res->get_path().length() && res->get_path().find("::") == -1 ) {
-				external_resources.insert(res);
+				int idx = external_resources.size();
+				external_resources[res]=idx;
 				return;
 			}
 
@@ -1842,10 +2118,18 @@ Error ResourceFormatSaverBinaryInstance::save(const String &p_path,const RES& p_
 
 	// save external resource table
 	f->store_32(external_resources.size()); //amount of external resources
-	for(Set<RES>::Element *E=external_resources.front();E;E=E->next()) {
+	Vector<RES> save_order;
+	save_order.resize(external_resources.size());
 
-		save_unicode_string(E->get()->get_save_type());
-		String path = E->get()->get_path();
+	for(Map<RES,int>::Element *E=external_resources.front();E;E=E->next()) {
+		save_order[E->get()]=E->key();
+	}
+
+	for(int i=0;i<save_order.size();i++) {
+
+		save_unicode_string(save_order[i]->get_save_type());
+		String path = save_order[i]->get_path();
+		path=relative_paths?local_path.path_to_file(path):path;
 		save_unicode_string(path);
 	}
 	// save internal resource table
@@ -1995,3 +2279,9 @@ void ResourceFormatSaverBinary::get_recognized_extensions(const RES& p_resource,
 
 }
 
+ResourceFormatSaverBinary* ResourceFormatSaverBinary::singleton=NULL;
+
+ResourceFormatSaverBinary::ResourceFormatSaverBinary() {
+
+	singleton=this;
+}
diff --git a/core/io/resource_format_binary.h b/core/io/resource_format_binary.h
index da415d97a52..8bf20bc5749 100644
--- a/core/io/resource_format_binary.h
+++ b/core/io/resource_format_binary.h
@@ -71,6 +71,7 @@ class ResourceInteractiveLoaderBinary : public ResourceInteractiveLoader {
 	String get_unicode_string();
 	void _advance_padding(uint32_t p_len);
 
+	Map<String,String> remaps;
 	Error error;
 
 	int stage;
@@ -88,9 +89,10 @@ public:
 	virtual int get_stage() const;
 	virtual int get_stage_count() const;
 
+	void set_remaps(const Map<String,String>& p_remaps) { remaps=p_remaps; }
 	void open(FileAccess *p_f);
 	String recognize(FileAccess *p_f);
-	void get_dependencies(FileAccess *p_f,List<String> *p_dependencies);
+	void get_dependencies(FileAccess *p_f, List<String> *p_dependencies, bool p_add_types);
 
 
 	ResourceInteractiveLoaderBinary();
@@ -101,13 +103,14 @@ public:
 class ResourceFormatLoaderBinary : public ResourceFormatLoader {
 public:
 
-	virtual Ref<ResourceInteractiveLoader> load_interactive(const String &p_path);
+	virtual Ref<ResourceInteractiveLoader> load_interactive(const String &p_path,Error *r_error=NULL);
 	virtual void get_recognized_extensions_for_type(const String& p_type,List<String> *p_extensions) const;
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual bool handles_type(const String& p_type) const;
 	virtual String get_resource_type(const String &p_path) const;
-	virtual void get_dependencies(const String& p_path,List<String> *p_dependencies);
+	virtual void get_dependencies(const String& p_path, List<String> *p_dependencies, bool p_add_types=false);
 	virtual Error load_import_metadata(const String &p_path, Ref<ResourceImportMetadata>& r_var) const;
+	virtual Error rename_dependencies(const String &p_path,const Map<String,String>& p_map);
 
 
 
@@ -134,7 +137,7 @@ class ResourceFormatSaverBinaryInstance  {
 	Vector<StringName> strings;
 
 
-	Set<RES> external_resources;
+	Map<RES,int> external_resources;
 	List<RES> saved_resources;
 
 
@@ -174,11 +177,12 @@ class ResourceFormatSaverBinary : public ResourceFormatSaver  {
 
 public:
 
+	static ResourceFormatSaverBinary* singleton;
 	virtual Error save(const String &p_path,const RES& p_resource,uint32_t p_flags=0);
 	virtual bool recognize(const RES& p_resource) const;
 	virtual void get_recognized_extensions(const RES& p_resource,List<String> *p_extensions) const;
 
-
+	ResourceFormatSaverBinary();
 };
 
 
diff --git a/core/io/resource_format_xml.cpp b/core/io/resource_format_xml.cpp
index b744cbf9678..9019b4e3c0d 100644
--- a/core/io/resource_format_xml.cpp
+++ b/core/io/resource_format_xml.cpp
@@ -29,10 +29,10 @@
 #include "resource_format_xml.h"
 #include "globals.h"
 #include "version.h"
+#include "os/dir_access.h"
 
 
-
-ResourceInteractiveLoaderXML::Tag* ResourceInteractiveLoaderXML::parse_tag(bool *r_exit,bool p_printerr) {
+ResourceInteractiveLoaderXML::Tag* ResourceInteractiveLoaderXML::parse_tag(bool *r_exit, bool p_printerr, List<String> *r_order) {
 
 
 	while(get_char()!='<' && !f->eof_reached()) {}
@@ -107,7 +107,11 @@ ResourceInteractiveLoaderXML::Tag* ResourceInteractiveLoaderXML::parse_tag(bool
 				if (r_value.size()) {
 
 					r_value.push_back(0);
-					tag.args[name].parse_utf8(r_value.get_data());
+					String str;
+					str.parse_utf8(r_value.get_data());
+					tag.args[name]=str;
+					if (r_order)
+						r_order->push_back(name);
 				}
 				break;
 
@@ -119,7 +123,11 @@ ResourceInteractiveLoaderXML::Tag* ResourceInteractiveLoaderXML::parse_tag(bool
 				} else if (reading_value && r_value.size()) {
 
 					r_value.push_back(0);
-					tag.args[name].parse_utf8(r_value.get_data());
+					String str;
+					str.parse_utf8(r_value.get_data());
+					tag.args[name]=str;
+					if (r_order)
+						r_order->push_back(name);
 					name="";
 					r_value.clear();
 					reading_value=false;
@@ -463,6 +471,10 @@ Error ResourceInteractiveLoaderXML::parse_property(Variant& r_v, String &r_name)
 
 			}
 
+			if (remaps.has(path)) {
+				path=remaps[path];
+			}
+
 			//take advantage of the resource loader cache. The resource is cached on it, even if
 			RES res=ResourceLoader::load(path,hint);
 
@@ -473,10 +485,31 @@ Error ResourceInteractiveLoaderXML::parse_property(Variant& r_v, String &r_name)
 			}
 
 			r_v=res.get_ref_ptr();
+		} else if (tag->args.has("external")) {
+
+			int index = tag->args["external"].to_int();
+			if (ext_resources.has(index)) {
+				String path=ext_resources[index].path;
+				String type=ext_resources[index].type;
+
+				//take advantage of the resource loader cache. The resource is cached on it, even if
+				RES res=ResourceLoader::load(path,type);
+
+				if (res.is_null()) {
+
+					WARN_PRINT(String("Couldn't load externalresource: "+path).ascii().get_data());
+				}
+
+				r_v=res.get_ref_ptr();
+			} else {
+				WARN_PRINT(String("Invalid external resource index: "+itos(index)).ascii().get_data());
+
+			}
 		}
 
 
 
+
 		Error err=goto_end_of_tag();
 		if (err) {
 			ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Error closing <resource> tag.");
@@ -1364,32 +1397,6 @@ Error ResourceInteractiveLoaderXML::poll() {
 	if (error!=OK)
 		return error;
 
-	if (ext_resources.size()) {
-
-		error=ERR_FILE_CORRUPT;
-		String path=ext_resources.front()->get();
-
-		RES res = ResourceLoader::load(path);
-
-		if (res.is_null()) {
-
-			if (ResourceLoader::get_abort_on_missing_resources()) {
-				ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": editor exported nonexistent resource at: "+path);
-				ERR_FAIL_V(error);
-			} else {
-				ResourceLoader::notify_load_error("Resource Not Found: "+path);
-			}
-		} else {
-
-			resource_cache.push_back(res);
-		}
-
-		error=OK;
-		ext_resources.pop_front();
-		resource_current++;
-		return error;
-	}
-
 	bool exit;
 	Tag *tag = parse_tag(&exit);
 
@@ -1413,12 +1420,13 @@ Error ResourceInteractiveLoaderXML::poll() {
 		ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": <ext_resource> missing 'path' field.");
 		ERR_FAIL_COND_V(!tag->args.has("path"),ERR_FILE_CORRUPT);
 
-		String type;
+		String type="Resource";
 		if (tag->args.has("type"))
 			type=tag->args["type"];
 
 		String path = tag->args["path"];
 
+
 		ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": <ext_resource> can't use a local path, this is a bug?.");
 		ERR_FAIL_COND_V(path.begins_with("local://"),ERR_FILE_CORRUPT);
 
@@ -1427,6 +1435,9 @@ Error ResourceInteractiveLoaderXML::poll() {
 			path=Globals::get_singleton()->localize_path(local_path.get_base_dir().plus_file(path));
 		}
 
+		if (remaps.has(path)) {
+			path=remaps[path];
+		}
 
 		RES res = ResourceLoader::load(path,type);
 
@@ -1436,13 +1447,21 @@ Error ResourceInteractiveLoaderXML::poll() {
 				ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": <ext_resource> referenced nonexistent resource at: "+path);
 				ERR_FAIL_V(error);
 			} else {
-				ResourceLoader::notify_load_error("Resource Not Found: "+path);
+				ResourceLoader::notify_dependency_error(local_path,path,type);
 			}
 		} else {
 
 			resource_cache.push_back(res);
 		}
 
+		if (tag->args.has("index")) {
+			ExtResource er;
+			er.path=path;
+			er.type=type;
+			ext_resources[tag->args["index"].to_int()]=er;
+		}
+
+
 		Error err = close_tag("ext_resource");
 		if (err)
 			return error;
@@ -1566,7 +1585,7 @@ int ResourceInteractiveLoaderXML::get_stage() const {
 }
 int ResourceInteractiveLoaderXML::get_stage_count() const {
 
-	return resources_total+ext_resources.size();
+	return resources_total;//+ext_resources;
 }
 
 ResourceInteractiveLoaderXML::~ResourceInteractiveLoaderXML() {
@@ -1574,7 +1593,7 @@ ResourceInteractiveLoaderXML::~ResourceInteractiveLoaderXML() {
 	memdelete(f);
 }
 
-void ResourceInteractiveLoaderXML::get_dependencies(FileAccess *f,List<String> *p_dependencies) {
+void ResourceInteractiveLoaderXML::get_dependencies(FileAccess *f,List<String> *p_dependencies,bool p_add_types) {
 
 
 	open(f);
@@ -1617,6 +1636,10 @@ void ResourceInteractiveLoaderXML::get_dependencies(FileAccess *f,List<String> *
 			path = ResourceLoader::guess_full_filename(path,type);
 		}
 
+		if (p_add_types && tag->args.has("type")) {
+			path+="::"+tag->args["type"];
+		}
+
 		p_dependencies->push_back(path);
 
 		Error err = close_tag("ext_resource");
@@ -1628,6 +1651,167 @@ void ResourceInteractiveLoaderXML::get_dependencies(FileAccess *f,List<String> *
 
 }
 
+Error ResourceInteractiveLoaderXML::rename_dependencies(FileAccess *p_f, const String &p_path,const Map<String,String>& p_map) {
+
+	open(p_f);
+	ERR_FAIL_COND_V(error!=OK,error);
+
+	//FileAccess
+
+	bool old_format=false;
+
+	FileAccess *fw = NULL;
+
+	String base_path=local_path.get_base_dir();
+
+	while(true) {
+		bool exit;
+		List<String> order;
+
+		Tag *tag = parse_tag(&exit,true,&order);
+
+		bool done=false;
+
+		if (!tag) {
+			if (fw) {
+				memdelete(fw);
+			}
+			error=ERR_FILE_CORRUPT;
+			ERR_FAIL_COND_V(!exit,error);
+			error=ERR_FILE_EOF;
+
+			return error;
+		}
+
+		if (tag->name=="ext_resource") {
+
+			if (!tag->args.has("index") || !tag->args.has("path") || !tag->args.has("type")) {
+				old_format=true;
+				break;
+			}
+
+			if (!fw) {
+
+				fw=FileAccess::open(p_path+".depren",FileAccess::WRITE);
+				fw->store_line("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>"); //no escape
+				fw->store_line("<resource_file type=\""+resource_type+"\" subresource_count=\""+itos(resources_total)+"\" version=\""+itos(VERSION_MAJOR)+"."+itos(VERSION_MINOR)+"\" version_name=\""+VERSION_FULL_NAME+"\">");
+
+			}
+
+			String path = tag->args["path"];
+			String index = tag->args["index"];
+			String type = tag->args["type"];
+
+
+			bool relative=false;
+			if (!path.begins_with("res://")) {
+				path=base_path.plus_file(path).simplify_path();
+				relative=true;
+			}
+
+
+			if (p_map.has(path)) {
+				String np=p_map[path];
+				path=np;
+			}
+
+			if (relative) {
+				//restore relative
+				path=base_path.path_to_file(path);
+			}
+
+			tag->args["path"]=path;
+			tag->args["index"]=index;
+			tag->args["type"]=type;
+
+		} else {
+
+			done=true;
+		}
+
+		String tagt="\t<";
+		if (exit)
+			tagt+="/";
+		tagt+=tag->name;
+
+		for(List<String>::Element *E=order.front();E;E=E->next()) {
+			tagt+=" "+E->get()+"=\""+tag->args[E->get()]+"\"";
+		}
+		tagt+=">";
+		fw->store_line(tagt);
+		if (done)
+			break;
+		close_tag("ext_resource");
+		fw->store_line("\t</ext_resource>");
+
+	}
+
+
+	if (old_format) {
+		if (fw)
+			memdelete(fw);
+
+		DirAccess *da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
+		da->remove(p_path+".depren");
+		memdelete(da);
+		//fuck it, use the old approach;
+
+		WARN_PRINT(("This file is old, so it can't refactor dependencies, opening and resaving: "+p_path).utf8().get_data());
+
+		Error err;
+		FileAccess *f2 = FileAccess::open(p_path,FileAccess::READ,&err);
+		if (err!=OK) {
+			ERR_FAIL_COND_V(err!=OK,ERR_FILE_CANT_OPEN);
+		}
+
+		Ref<ResourceInteractiveLoaderXML> ria = memnew( ResourceInteractiveLoaderXML );
+		ria->local_path=Globals::get_singleton()->localize_path(p_path);
+		ria->res_path=ria->local_path;
+		ria->remaps=p_map;
+	//	ria->set_local_path( Globals::get_singleton()->localize_path(p_path) );
+		ria->open(f2);
+
+		err = ria->poll();
+
+		while(err==OK) {
+			err=ria->poll();
+		}
+
+		ERR_FAIL_COND_V(err!=ERR_FILE_EOF,ERR_FILE_CORRUPT);
+		RES res = ria->get_resource();
+		ERR_FAIL_COND_V(!res.is_valid(),ERR_FILE_CORRUPT);
+
+		return ResourceFormatSaverXML::singleton->save(p_path,res);
+	}
+
+	if (!fw) {
+
+		return OK; //nothing to rename, do nothing
+	}
+
+	uint8_t c=f->get_8();
+	while(!f->eof_reached()) {
+		fw->store_8(c);
+		c=f->get_8();
+	}
+
+	bool all_ok = fw->get_error()==OK;
+
+	memdelete(fw);
+
+	if (!all_ok) {
+		return ERR_CANT_CREATE;
+	}
+
+	DirAccess *da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
+	da->remove(p_path);
+	da->rename(p_path+".depren",p_path);
+	memdelete(da);
+
+	return OK;
+
+}
+
 
 void ResourceInteractiveLoaderXML::open(FileAccess *p_f) {
 
@@ -1686,6 +1870,7 @@ void ResourceInteractiveLoaderXML::open(FileAccess *p_f) {
 
 	}
 
+	/*
 	String preload_depts = "deps/"+local_path.md5_text();
 	if (Globals::get_singleton()->has(preload_depts)) {
 		ext_resources.clear();
@@ -1697,7 +1882,7 @@ void ResourceInteractiveLoaderXML::open(FileAccess *p_f) {
 		}
 		print_line(local_path+" - EXTERNAL RESOURCES: "+itos(ext_resources.size()));
 	}
-
+*/
 
 }
 
@@ -1730,7 +1915,10 @@ String ResourceInteractiveLoaderXML::recognize(FileAccess *p_f) {
 
 /////////////////////
 
-Ref<ResourceInteractiveLoader> ResourceFormatLoaderXML::load_interactive(const String &p_path) {
+Ref<ResourceInteractiveLoader> ResourceFormatLoaderXML::load_interactive(const String &p_path, Error *r_error) {
+
+	if (r_error)
+		*r_error=ERR_CANT_OPEN;
 
 	Error err;
 	FileAccess *f = FileAccess::open(p_path,FileAccess::READ,&err);
@@ -1816,7 +2004,7 @@ String ResourceFormatLoaderXML::get_resource_type(const String &p_path) const{
 }
 
 
-void ResourceFormatLoaderXML::get_dependencies(const String& p_path,List<String> *p_dependencies) {
+void ResourceFormatLoaderXML::get_dependencies(const String& p_path,List<String> *p_dependencies,bool p_add_types) {
 
 	FileAccess *f = FileAccess::open(p_path,FileAccess::READ);
 	if (!f) {
@@ -1828,11 +2016,27 @@ void ResourceFormatLoaderXML::get_dependencies(const String& p_path,List<String>
 	ria->local_path=Globals::get_singleton()->localize_path(p_path);
 	ria->res_path=ria->local_path;
 //	ria->set_local_path( Globals::get_singleton()->localize_path(p_path) );
-	ria->get_dependencies(f,p_dependencies);
+	ria->get_dependencies(f,p_dependencies,p_add_types);
 
 
 }
 
+Error ResourceFormatLoaderXML::rename_dependencies(const String &p_path,const Map<String,String>& p_map) {
+
+	FileAccess *f = FileAccess::open(p_path,FileAccess::READ);
+	if (!f) {
+
+		ERR_FAIL_V(ERR_CANT_OPEN);
+	}
+
+	Ref<ResourceInteractiveLoaderXML> ria = memnew( ResourceInteractiveLoaderXML );
+	ria->local_path=Globals::get_singleton()->localize_path(p_path);
+	ria->res_path=ria->local_path;
+//	ria->set_local_path( Globals::get_singleton()->localize_path(p_path) );
+	return ria->rename_dependencies(f,p_path,p_map);
+}
+
+
 /****************************************************************************************/
 /****************************************************************************************/
 /****************************************************************************************/
@@ -2024,20 +2228,26 @@ void ResourceFormatSaverXMLInstance::write_property(const String& p_name,const V
 				return; // don't save it
 			}
 
-			params="resource_type=\""+res->get_save_type()+"\"";
+			if (external_resources.has(res)) {
 
-			if (res->get_path().length() && res->get_path().find("::")==-1) {
-				//external resource
-				String path=relative_paths?local_path.path_to_file(res->get_path()):res->get_path();
-				escape(path);
-				params+=" path=\""+path+"\"";
+				params="external=\""+itos(external_resources[res])+"\"";
 			} else {
+				params="resource_type=\""+res->get_save_type()+"\"";
 
-				//internal resource
-				ERR_EXPLAIN("Resource was not pre cached for the resource section, bug?");
-				ERR_FAIL_COND(!resource_set.has(res));
 
-				params+=" path=\"local://"+itos(res->get_subindex())+"\"";
+				if (res->get_path().length() && res->get_path().find("::")==-1) {
+					//external resource
+					String path=relative_paths?local_path.path_to_file(res->get_path()):res->get_path();
+					escape(path);
+					params+=" path=\""+path+"\"";
+				} else {
+
+					//internal resource
+					ERR_EXPLAIN("Resource was not pre cached for the resource section, bug?");
+					ERR_FAIL_COND(!resource_set.has(res));
+
+					params+=" path=\"local://"+itos(res->get_subindex())+"\"";
+				}
 			}
 
 		} break;
@@ -2441,11 +2651,12 @@ void ResourceFormatSaverXMLInstance::_find_resources(const Variant& p_variant,bo
 
 			RES res = p_variant.operator RefPtr();
 
-			if (res.is_null())
+			if (res.is_null() || external_resources.has(res))
 				return;
 
 			if (!p_main && (!bundle_resources ) && res->get_path().length() && res->get_path().find("::") == -1 ) {
-				external_resources.push_back(res);
+				int index = external_resources.size();
+				external_resources[res]=index;
 				return;
 			}
 
@@ -2533,12 +2744,12 @@ Error ResourceFormatSaverXMLInstance::save(const String &p_path,const RES& p_res
 	enter_tag("resource_file","type=\""+p_resource->get_type()+"\" subresource_count=\""+itos(saved_resources.size()+external_resources.size())+"\" version=\""+itos(VERSION_MAJOR)+"."+itos(VERSION_MINOR)+"\" version_name=\""+VERSION_FULL_NAME+"\"");
 	write_string("\n",false);
 
-	for(List<RES>::Element *E=external_resources.front();E;E=E->next()) {
+	for(Map<RES,int>::Element *E=external_resources.front();E;E=E->next()) {
 
 		write_tabs();
-		String p = E->get()->get_path();
+		String p = E->key()->get_path();
 
-		enter_tag("ext_resource","path=\""+p+"\" type=\""+E->get()->get_save_type()+"\""); //bundled
+		enter_tag("ext_resource","path=\""+p+"\" type=\""+E->key()->get_save_type()+"\" index=\""+itos(E->get())+"\""); //bundled
 		exit_tag("ext_resource"); //bundled
 		write_string("\n",false);
 	}
@@ -2667,3 +2878,8 @@ void ResourceFormatSaverXML::get_recognized_extensions(const RES& p_resource,Lis
 	}
 
 }
+
+ResourceFormatSaverXML* ResourceFormatSaverXML::singleton=NULL;
+ResourceFormatSaverXML::ResourceFormatSaverXML() {
+	singleton=this;
+}
diff --git a/core/io/resource_format_xml.h b/core/io/resource_format_xml.h
index d5ba9eb8001..77987c6a5b6 100644
--- a/core/io/resource_format_xml.h
+++ b/core/io/resource_format_xml.h
@@ -46,13 +46,21 @@ class ResourceInteractiveLoaderXML : public ResourceInteractiveLoader {
 
 		String name;
 		HashMap<String,String> args;
+
 	};
 
 	_FORCE_INLINE_ Error _parse_array_element(Vector<char> &buff,bool p_number_only,FileAccess *f,bool *end);
 
 
+	struct ExtResource {
+		String path;
+		String type;
+	};
 
-	List<StringName> ext_resources;
+
+	Map<String,String> remaps;
+
+	Map<int,ExtResource> ext_resources;
 
 	int resources_total;
 	int resource_current;
@@ -66,7 +74,7 @@ friend class ResourceFormatLoaderXML;
 	List<Tag> tag_stack;
 
 	List<RES> resource_cache;
-	Tag* parse_tag(bool* r_exit=NULL,bool p_printerr=true);
+	Tag* parse_tag(bool* r_exit=NULL,bool p_printerr=true,List<String> *r_order=NULL);
 	Error close_tag(const String& p_name);
 	_FORCE_INLINE_ void unquote(String& p_str);
 	Error goto_end_of_tag();
@@ -87,7 +95,8 @@ public:
 
 	void open(FileAccess *p_f);
 	String recognize(FileAccess *p_f);
-	void get_dependencies(FileAccess *p_f,List<String> *p_dependencies);
+	void get_dependencies(FileAccess *p_f, List<String> *p_dependencies, bool p_add_types);
+	Error rename_dependencies(FileAccess *p_f, const String &p_path,const Map<String,String>& p_map);
 
 
 	~ResourceInteractiveLoaderXML();
@@ -97,12 +106,13 @@ public:
 class ResourceFormatLoaderXML : public ResourceFormatLoader {
 public:
 
-	virtual Ref<ResourceInteractiveLoader> load_interactive(const String &p_path);
+	virtual Ref<ResourceInteractiveLoader> load_interactive(const String &p_path,Error *r_error=NULL);
 	virtual void get_recognized_extensions_for_type(const String& p_type,List<String> *p_extensions) const;
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual bool handles_type(const String& p_type) const;
 	virtual String get_resource_type(const String &p_path) const;
-	virtual void get_dependencies(const String& p_path,List<String> *p_dependencies);
+	virtual void get_dependencies(const String& p_path, List<String> *p_dependencies, bool p_add_types=false);
+	virtual Error rename_dependencies(const String &p_path,const Map<String,String>& p_map);
 
 
 };
@@ -125,7 +135,7 @@ class ResourceFormatSaverXMLInstance  {
 	int depth;
 	Set<RES> resource_set;
 	List<RES> saved_resources;
-	List<RES> external_resources;
+	Map<RES,int> external_resources;
 
 	void enter_tag(const char* p_tag,const String& p_args=String());
 	void exit_tag(const char* p_tag);
@@ -148,11 +158,12 @@ public:
 
 class ResourceFormatSaverXML : public ResourceFormatSaver {
 public:
+	static ResourceFormatSaverXML* singleton;
 	virtual Error save(const String &p_path,const RES& p_resource,uint32_t p_flags=0);
 	virtual bool recognize(const RES& p_resource) const;
 	virtual void get_recognized_extensions(const RES& p_resource,List<String> *p_extensions) const;
 
-
+	ResourceFormatSaverXML();
 };
 
 
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp
index 22d89840ae5..1e014480f4d 100644
--- a/core/io/resource_loader.cpp
+++ b/core/io/resource_loader.cpp
@@ -103,10 +103,10 @@ public:
 
 
 
-Ref<ResourceInteractiveLoader> ResourceFormatLoader::load_interactive(const String &p_path) {
+Ref<ResourceInteractiveLoader> ResourceFormatLoader::load_interactive(const String &p_path, Error *r_error) {
 
 	//either this
-	Ref<Resource> res = load(p_path);
+	Ref<Resource> res = load(p_path,p_path,r_error);
 	if (res.is_null())
 		return Ref<ResourceInteractiveLoader>();
 
@@ -115,12 +115,13 @@ Ref<ResourceInteractiveLoader> ResourceFormatLoader::load_interactive(const Stri
 	return ril;
 }
 
-RES ResourceFormatLoader::load(const String &p_path,const String& p_original_path) {
+RES ResourceFormatLoader::load(const String &p_path, const String& p_original_path, Error *r_error) {
+
 
 	String path=p_path;
 
 	//or this must be implemented
-	Ref<ResourceInteractiveLoader> ril = load_interactive(p_path);
+	Ref<ResourceInteractiveLoader> ril = load_interactive(p_path,r_error);
 	if (!ril.is_valid())
 		return RES();
 	ril->set_local_path(p_original_path);
@@ -130,9 +131,14 @@ RES ResourceFormatLoader::load(const String &p_path,const String& p_original_pat
 		Error err = ril->poll();
 
 		if (err==ERR_FILE_EOF) {
+			if (r_error)
+				*r_error=OK;
 			return ril->get_resource();
 		}
 
+		if (r_error)
+			*r_error=err;
+
 		ERR_FAIL_COND_V(err!=OK,RES());
 	}
 
@@ -140,7 +146,7 @@ RES ResourceFormatLoader::load(const String &p_path,const String& p_original_pat
 
 }
 
-void ResourceFormatLoader::get_dependencies(const String& p_path,List<String> *p_dependencies) {
+void ResourceFormatLoader::get_dependencies(const String& p_path, List<String> *p_dependencies, bool p_add_types) {
 
 	//do nothing by default
 }
@@ -149,7 +155,10 @@ void ResourceFormatLoader::get_dependencies(const String& p_path,List<String> *p
 ///////////////////////////////////
 
 
-RES ResourceLoader::load(const String &p_path,const String& p_type_hint,bool p_no_cache) {
+RES ResourceLoader::load(const String &p_path, const String& p_type_hint, bool p_no_cache, Error *r_error) {
+
+	if (r_error)
+		*r_error=ERR_CANT_OPEN;
 
 	String local_path;
 	if (p_path.is_rel_path())
@@ -183,7 +192,7 @@ RES ResourceLoader::load(const String &p_path,const String& p_type_hint,bool p_n
 		if (p_type_hint!="" && !loader[i]->handles_type(p_type_hint))
 			continue;
 		found=true;
-		RES res = loader[i]->load(remapped_path,local_path);
+		RES res = loader[i]->load(remapped_path,local_path,r_error);
 		if (res.is_null())
 			continue;
 		if (!p_no_cache)
@@ -289,9 +298,11 @@ String ResourceLoader::find_complete_path(const String& p_path,const String& p_t
 	return local_path;
 }
 
-Ref<ResourceInteractiveLoader> ResourceLoader::load_interactive(const String &p_path,const String& p_type_hint,bool p_no_cache) {
+Ref<ResourceInteractiveLoader> ResourceLoader::load_interactive(const String &p_path,const String& p_type_hint,bool p_no_cache,Error *r_error) {
 
 
+	if (r_error)
+		*r_error=ERR_CANT_OPEN;
 
 	String local_path;
 	if (p_path.is_rel_path())
@@ -327,7 +338,7 @@ Ref<ResourceInteractiveLoader> ResourceLoader::load_interactive(const String &p_
 		if (p_type_hint!="" && !loader[i]->handles_type(p_type_hint))
 			continue;
 		found=true;
-		Ref<ResourceInteractiveLoader> ril = loader[i]->load_interactive(remapped_path);
+		Ref<ResourceInteractiveLoader> ril = loader[i]->load_interactive(remapped_path,r_error);
 		if (ril.is_null())
 			continue;
 		if (!p_no_cache)
@@ -352,7 +363,7 @@ void ResourceLoader::add_resource_format_loader(ResourceFormatLoader *p_format_l
 	loader[loader_count++]=p_format_loader;
 }
 
-void ResourceLoader::get_dependencies(const String& p_path,List<String> *p_dependencies) {
+void ResourceLoader::get_dependencies(const String& p_path, List<String> *p_dependencies, bool p_add_types) {
 
 
 	String local_path;
@@ -372,11 +383,40 @@ void ResourceLoader::get_dependencies(const String& p_path,List<String> *p_depen
 		//if (p_type_hint!="" && !loader[i]->handles_type(p_type_hint))
 		//	continue;
 
-		loader[i]->get_dependencies(remapped_path,p_dependencies);
+		loader[i]->get_dependencies(remapped_path,p_dependencies,p_add_types);
 
 	}
 }
 
+Error ResourceLoader::rename_dependencies(const String &p_path,const Map<String,String>& p_map) {
+
+
+	String local_path;
+	if (p_path.is_rel_path())
+		local_path="res://"+p_path;
+	else
+		local_path = Globals::get_singleton()->localize_path(p_path);
+
+	String remapped_path = PathRemap::get_singleton()->get_remap(local_path);
+
+	String extension=remapped_path.extension();
+
+	for (int i=0;i<loader_count;i++) {
+
+		if (!loader[i]->recognize(extension))
+			continue;
+		//if (p_type_hint!="" && !loader[i]->handles_type(p_type_hint))
+		//	continue;
+
+		return loader[i]->rename_dependencies(p_path,p_map);
+
+	}
+
+	return OK; // ??
+
+}
+
+
 String ResourceLoader::guess_full_filename(const String &p_path,const String& p_type) {
 
 	String local_path;
@@ -414,6 +454,9 @@ String ResourceLoader::get_resource_type(const String &p_path) {
 ResourceLoadErrorNotify ResourceLoader::err_notify=NULL;
 void *ResourceLoader::err_notify_ud=NULL;
 
+DependencyErrorNotify ResourceLoader::dep_err_notify=NULL;
+void *ResourceLoader::dep_err_notify_ud=NULL;
+
 bool ResourceLoader::abort_on_missing_resource=true;
 bool ResourceLoader::timestamp_on_load=false;
 
diff --git a/core/io/resource_loader.h b/core/io/resource_loader.h
index d25727f19f9..00a05dcb430 100644
--- a/core/io/resource_loader.h
+++ b/core/io/resource_loader.h
@@ -57,21 +57,23 @@ public:
 class ResourceFormatLoader {
 public:
 
-	virtual Ref<ResourceInteractiveLoader> load_interactive(const String &p_path);
-	virtual RES load(const String &p_path,const String& p_original_path="");
+	virtual Ref<ResourceInteractiveLoader> load_interactive(const String &p_path,Error *r_error=NULL);
+	virtual RES load(const String &p_path,const String& p_original_path="",Error *r_error=NULL);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const=0;
 	virtual void get_recognized_extensions_for_type(const String& p_type,List<String> *p_extensions) const;
 	bool recognize(const String& p_extension) const;
 	virtual bool handles_type(const String& p_type) const=0;
 	virtual String get_resource_type(const String &p_path) const=0;
-	virtual void get_dependencies(const String& p_path,List<String> *p_dependencies);
+	virtual void get_dependencies(const String& p_path,List<String> *p_dependencies,bool p_add_types=false);
 	virtual Error load_import_metadata(const String &p_path, Ref<ResourceImportMetadata>& r_var) const { return ERR_UNAVAILABLE; }
+	virtual Error rename_dependencies(const String &p_path,const Map<String,String>& p_map) { return OK; }
 
 	virtual ~ResourceFormatLoader() {}
 };
 
 
 typedef void (*ResourceLoadErrorNotify)(void *p_ud,const String& p_text);
+typedef void (*DependencyErrorNotify)(void *p_ud,const String& p_loading,const String& p_which,const String& p_type);
 
 
 class ResourceLoader {	
@@ -86,6 +88,8 @@ class ResourceLoader {
 
 	static void* err_notify_ud;
 	static ResourceLoadErrorNotify err_notify;
+	static void* dep_err_notify_ud;
+	static DependencyErrorNotify dep_err_notify;
 	static bool abort_on_missing_resource;
 
 	static String find_complete_path(const String& p_path,const String& p_type);
@@ -93,14 +97,15 @@ public:
 
 
 	
-	static Ref<ResourceInteractiveLoader> load_interactive(const String &p_path,const String& p_type_hint="",bool p_no_cache=false);
-	static RES load(const String &p_path,const String& p_type_hint="",bool p_no_cache=false);
+	static Ref<ResourceInteractiveLoader> load_interactive(const String &p_path,const String& p_type_hint="",bool p_no_cache=false,Error *r_error=NULL);
+	static RES load(const String &p_path,const String& p_type_hint="",bool p_no_cache=false,Error *r_error=NULL);
 	static Ref<ResourceImportMetadata> load_import_metadata(const String &p_path);
 
 	static void get_recognized_extensions_for_type(const String& p_type,List<String> *p_extensions);
 	static void add_resource_format_loader(ResourceFormatLoader *p_format_loader);
 	static String get_resource_type(const String &p_path);
-	static void get_dependencies(const String& p_path,List<String> *p_dependencies);
+	static void get_dependencies(const String& p_path,List<String> *p_dependencies,bool p_add_types=false);
+	static Error rename_dependencies(const String &p_path,const Map<String,String>& p_map);
 
 	static String guess_full_filename(const String &p_path,const String& p_type);
 
@@ -108,6 +113,11 @@ public:
 
 	static void notify_load_error(const String& p_err) { if (err_notify) err_notify(err_notify_ud,p_err); }
 	static void set_error_notify_func(void* p_ud,ResourceLoadErrorNotify p_err_notify) { err_notify=p_err_notify; err_notify_ud=p_ud;}
+
+	static void notify_dependency_error(const String& p_path,const String& p_dependency,const String& p_type) { if (dep_err_notify) dep_err_notify(dep_err_notify_ud,p_path,p_dependency,p_type); }
+	static void set_dependency_error_notify_func(void* p_ud,DependencyErrorNotify p_err_notify) { dep_err_notify=p_err_notify; dep_err_notify_ud=p_ud;}
+
+
 	static void set_abort_on_missing_resources(bool p_abort) { abort_on_missing_resource=p_abort; }
 	static bool get_abort_on_missing_resources() { return abort_on_missing_resource; }
 };
diff --git a/core/io/resource_saver.h b/core/io/resource_saver.h
index 05cbe7f98e7..8382b65290a 100644
--- a/core/io/resource_saver.h
+++ b/core/io/resource_saver.h
@@ -46,7 +46,7 @@ public:
 	virtual Error save(const String &p_path,const RES& p_resource,uint32_t p_flags=0)=0;
 	virtual bool recognize(const RES& p_resource) const=0;
 	virtual void get_recognized_extensions(const RES& p_resource,List<String> *p_extensions) const=0;
-		
+
 	virtual ~ResourceFormatSaver() {}
 };
 
diff --git a/core/io/translation_loader_po.cpp b/core/io/translation_loader_po.cpp
index c32b25c4075..020d1682080 100644
--- a/core/io/translation_loader_po.cpp
+++ b/core/io/translation_loader_po.cpp
@@ -30,7 +30,10 @@
 #include "os/file_access.h"
 #include "translation.h"
 
-RES TranslationLoaderPO::load(const String &p_path,const String& p_original_path) {
+RES TranslationLoaderPO::load(const String &p_path, const String& p_original_path, Error *r_error) {
+
+	if (r_error)
+		*r_error=ERR_CANT_OPEN;
 
 	FileAccess *f=FileAccess::open(p_path,FileAccess::READ);
 	ERR_FAIL_COND_V(!f,RES());
@@ -49,6 +52,8 @@ RES TranslationLoaderPO::load(const String &p_path,const String& p_original_path
 	String msg_id;
 	String msg_str;
 	String config;
+	if (r_error)
+		*r_error=ERR_FILE_CORRUPT;
 
 	Ref<Translation> translation = Ref<Translation>( memnew( Translation ));
 	int line = 1;
@@ -174,6 +179,8 @@ RES TranslationLoaderPO::load(const String &p_path,const String& p_original_path
 		}
 	}
 
+	if (r_error)
+		*r_error=OK;
 
 	return translation;
 
diff --git a/core/io/translation_loader_po.h b/core/io/translation_loader_po.h
index 9d8ad97a29b..e07ae15e288 100644
--- a/core/io/translation_loader_po.h
+++ b/core/io/translation_loader_po.h
@@ -34,7 +34,7 @@
 class TranslationLoaderPO : public ResourceFormatLoader {
 public:
 
-	virtual RES load(const String &p_path,const String& p_original_path="");
+	virtual RES load(const String &p_path,const String& p_original_path="",Error *r_error=NULL);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual bool handles_type(const String& p_type) const;
 	virtual String get_resource_type(const String &p_path) const;
diff --git a/core/io/zip.h b/core/io/zip.h
index cca06c2ee80..85f93568c99 100644
--- a/core/io/zip.h
+++ b/core/io/zip.h
@@ -39,6 +39,8 @@
 #ifndef _zip12_H
 #define _zip12_H
 
+#include <stdlib.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/core/io/zip_io.h b/core/io/zip_io.h
index c4b4d6b34d6..dd3c371a4aa 100644
--- a/core/io/zip_io.h
+++ b/core/io/zip_io.h
@@ -34,6 +34,7 @@
 #include "os/file_access.h"
 #include "os/copymem.h"
 
+
 static void* zipio_open(void* data, const char* p_fname, int mode) {
 
 	FileAccess *&f = *(FileAccess**)data;
diff --git a/core/object_type_db.cpp b/core/object_type_db.cpp
index c2917145737..a64b3d27151 100644
--- a/core/object_type_db.cpp
+++ b/core/object_type_db.cpp
@@ -746,6 +746,25 @@ bool ObjectTypeDB::has_method(StringName p_type,StringName p_method,bool p_no_in
 
 }
 
+bool ObjectTypeDB::get_setter_and_type_for_property(const StringName& p_class, const StringName& p_prop, StringName& r_class, StringName& r_setter) {
+
+	TypeInfo *type=types.getptr(p_class);
+	TypeInfo *check=type;
+	while(check) {
+
+		if (check->property_setget.has(p_prop)) {
+			r_class=check->name;
+			r_setter=check->property_setget[p_prop].setter;
+			return true;
+		}
+
+		check=check->inherits_ptr;
+	}
+
+	return false;
+
+}
+
 #ifdef DEBUG_METHODS_ENABLED
 MethodBind* ObjectTypeDB::bind_methodfi(uint32_t p_flags, MethodBind *p_bind , const MethodDefinition &method_name, const Variant **p_defs, int p_defcount) {
 	StringName mdname=method_name.name;
diff --git a/core/object_type_db.h b/core/object_type_db.h
index caa5baddd5a..bfa0f921e50 100644
--- a/core/object_type_db.h
+++ b/core/object_type_db.h
@@ -475,7 +475,9 @@ public:
 	static void get_integer_constant_list(const StringName& p_type, List<String> *p_constants, bool p_no_inheritance=false);
 	static int get_integer_constant(const StringName& p_type, const StringName &p_name, bool *p_success=NULL);
 	static StringName get_category(const StringName& p_node);
-	
+
+	static bool get_setter_and_type_for_property(const StringName& p_class, const StringName& p_prop, StringName& r_class, StringName& r_setter);
+
 	static void set_type_enabled(StringName p_type,bool p_enable);
 	static bool is_type_enabled(StringName p_type);
 
diff --git a/core/os/input.cpp b/core/os/input.cpp
index 2b939ede464..cf2938f5cd1 100644
--- a/core/os/input.cpp
+++ b/core/os/input.cpp
@@ -271,6 +271,38 @@ void InputDefault::parse_input_event(const InputEvent& p_event) {
 				mouse_button_mask|=(1<<p_event.mouse_button.button_index);
 			else
 				mouse_button_mask&=~(1<<p_event.mouse_button.button_index);
+
+			if (main_loop && emulate_touch && p_event.mouse_button.button_index==1) {
+				InputEventScreenTouch touch_event;
+				touch_event.index=0;
+				touch_event.pressed=p_event.mouse_button.pressed;
+				touch_event.x=p_event.mouse_button.x;
+				touch_event.y=p_event.mouse_button.y;
+				InputEvent ev;
+				ev.type=InputEvent::SCREEN_TOUCH;
+				ev.screen_touch=touch_event;
+				main_loop->input_event(ev);
+			}
+		} break;
+		case InputEvent::MOUSE_MOTION: {
+
+			if (main_loop && emulate_touch && p_event.mouse_motion.button_mask&1) {
+				InputEventScreenDrag drag_event;
+				drag_event.index=0;
+				drag_event.x=p_event.mouse_motion.x;
+				drag_event.y=p_event.mouse_motion.y;
+				drag_event.relative_x=p_event.mouse_motion.relative_x;
+				drag_event.relative_y=p_event.mouse_motion.relative_y;
+				drag_event.speed_x=p_event.mouse_motion.speed_x;
+				drag_event.speed_y=p_event.mouse_motion.speed_y;
+
+				InputEvent ev;
+				ev.type=InputEvent::SCREEN_DRAG;
+				ev.screen_drag=drag_event;
+
+				main_loop->input_event(ev);
+			}
+
 		} break;
 		case InputEvent::JOYSTICK_BUTTON: {
 
@@ -362,8 +394,19 @@ void InputDefault::action_release(const StringName& p_action){
 	}
 }
 
+void InputDefault::set_emulate_touch(bool p_emulate) {
+
+	emulate_touch=p_emulate;
+}
+
+bool InputDefault::is_emulating_touchscreen() const {
+
+	return emulate_touch;
+}
+
 InputDefault::InputDefault() {
 
 	mouse_button_mask=0;
+	emulate_touch=false;
 	main_loop=NULL;
 }
diff --git a/core/os/input.h b/core/os/input.h
index ce14c2166ed..5c69ced825f 100644
--- a/core/os/input.h
+++ b/core/os/input.h
@@ -78,6 +78,8 @@ public:
 
 	void get_argument_options(const StringName& p_function,int p_idx,List<String>*r_options) const;
 
+	virtual bool is_emulating_touchscreen() const=0;
+
 
 	Input();
 };
@@ -99,6 +101,8 @@ class InputDefault : public Input {
 	Vector2 mouse_pos;
 	MainLoop *main_loop;
 
+	bool emulate_touch;
+
 	struct SpeedTrack {
 
 		uint64_t last_tick;
@@ -147,6 +151,9 @@ public:
 
 	void iteration(float p_step);
 
+	void set_emulate_touch(bool p_emulate);
+	virtual bool is_emulating_touchscreen() const;
+
 	InputDefault();
 
 };
diff --git a/core/os/os.cpp b/core/os/os.cpp
index efcd492230f..2db926e5565 100644
--- a/core/os/os.cpp
+++ b/core/os/os.cpp
@@ -31,7 +31,7 @@
 #include <stdarg.h>
 #include "dir_access.h"
 #include "globals.h"
-
+#include "input.h"
 
 OS* OS::singleton=NULL;
 
@@ -363,7 +363,7 @@ Error OS::set_cwd(const String& p_cwd) {
 bool OS::has_touchscreen_ui_hint() const {
 
 	//return false;
-	return GLOBAL_DEF("display/emulate_touchscreen",false);
+	return Input::get_singleton() && Input::get_singleton()->is_emulating_touchscreen();
 }
 
 int OS::get_free_static_memory() const {
diff --git a/core/os/os.h b/core/os/os.h
index e8ecfa10548..d89734d7d38 100644
--- a/core/os/os.h
+++ b/core/os/os.h
@@ -155,7 +155,7 @@ public:
 	virtual int get_screen_count() const{ return 1; }
 	virtual int get_current_screen() const { return 0; }
 	virtual void set_current_screen(int p_screen) { }
-	virtual Point2 get_screen_position(int p_screen=0)  { return Point2(); }
+	virtual Point2 get_screen_position(int p_screen=0) const { return Point2(); }
 	virtual Size2 get_screen_size(int p_screen=0) const { return get_window_size(); }
 	virtual Point2 get_window_position() const { return Vector2(); }
 	virtual void set_window_position(const Point2& p_position) {}
diff --git a/core/typedefs.h b/core/typedefs.h
index ae1eb1f5e77..6ca31fd1374 100644
--- a/core/typedefs.h
+++ b/core/typedefs.h
@@ -41,8 +41,8 @@
 #define _MKSTR(m_x) _STR(m_x)
 #endif
 // have to include version.h for this to work, include it in the .cpp not the .h
-#define VERSION_MKSTRING _MKSTR(VERSION_MAJOR)"."_MKSTR(VERSION_MINOR)"."_MKSTR(VERSION_STATUS)"."_MKSTR(VERSION_REVISION)
-#define VERSION_FULL_NAME _MKSTR(VERSION_NAME)" v"VERSION_MKSTRING
+#define VERSION_MKSTRING _MKSTR(VERSION_MAJOR)"." _MKSTR(VERSION_MINOR)"." _MKSTR(VERSION_STATUS)"." _MKSTR(VERSION_REVISION)
+#define VERSION_FULL_NAME _MKSTR(VERSION_NAME)" v" VERSION_MKSTRING
 
 
 #ifndef _ALWAYS_INLINE_
diff --git a/core/ustring.cpp b/core/ustring.cpp
index 3cfc1e4a3c0..ff7c8984fad 100644
--- a/core/ustring.cpp
+++ b/core/ustring.cpp
@@ -3048,6 +3048,37 @@ bool String::is_valid_identifier() const {
 
 //kind of poor should be rewritten properly
 
+String String::world_wrap(int p_chars_per_line) const {
+
+	int from=0;
+	int last_space=0;
+	String ret;
+	for(int i=0;i<length();i++) {
+		if (i-from>=p_chars_per_line) {
+			if (last_space==-1) {
+				ret+=substr(from,i-from+1)+"\n";
+			} else {
+				ret+=substr(from,last_space-from)+"\n";
+				i=last_space; //rewind
+			}
+			from=i+1;
+			last_space=-1;
+		} else if (operator[](i)==' ' || operator[](i)=='\t') {
+			last_space=i;
+		} else if (operator[](i)=='\n') {
+			ret+=substr(from,i-from);
+			from=i+1;
+			last_space=-1;
+		}
+	}
+
+	if (from<length()) {
+		ret+=substr(from,length());
+	}
+
+	return ret;
+}
+
 String String::c_unescape() const {
 
 	String escaped=*this;
diff --git a/core/ustring.h b/core/ustring.h
index 1000c1cc8a9..fa25a07eb07 100644
--- a/core/ustring.h
+++ b/core/ustring.h
@@ -209,6 +209,7 @@ public:
 	String xml_unescape() const;
 	String c_escape() const;
 	String c_unescape() const;
+	String world_wrap(int p_chars_per_line) const;
 	
 	String percent_encode() const;
 	String percent_decode() const;
diff --git a/core/variant.cpp b/core/variant.cpp
index e0bceb4dd8f..c6a55b10e6c 100644
--- a/core/variant.cpp
+++ b/core/variant.cpp
@@ -1592,9 +1592,17 @@ Variant::operator String() const {
 		} break;
 		case OBJECT: {
 
-			if (_get_obj().obj)
+			if (_get_obj().obj) {
+				#ifdef DEBUG_ENABLED
+					if (ScriptDebugger::get_singleton() && _get_obj().ref.is_null()) {
+						//only if debugging!
+						if (!ObjectDB::instance_validate(_get_obj().obj)) {
+							return "[Deleted Object]";
+						};
+					};
+				#endif
 				return "["+_get_obj().obj->get_type()+":"+itos(_get_obj().obj->get_instance_ID())+"]";
-			else
+			} else
 				return "[Object:null]";
 
 		} break;
diff --git a/demos/2d/platformer/engine.cfg b/demos/2d/platformer/engine.cfg
index 50b6b862e97..cf679cedea4 100644
--- a/demos/2d/platformer/engine.cfg
+++ b/demos/2d/platformer/engine.cfg
@@ -4,14 +4,17 @@ name="Platformer"
 main_scene="res://stage.xml"
 icon="res://icon.png"
 name_es="Plataformero"
+target_fps="60"
 
 [display]
 
 width=800
 height=480
-stretch_2d=false
-stretch_mode="viewport"
-stretch_aspect="keep"
+#stretch_2d=false
+#stretch_mode="viewport"
+#stretch_aspect="keep"
+stretch_mode="2d"
+stretch_aspect="keep_height"
 
 [image_loader]
 
diff --git a/drivers/chibi/event_stream_chibi.cpp b/drivers/chibi/event_stream_chibi.cpp
index e87e0a9aaae..ecb5c3f22bf 100644
--- a/drivers/chibi/event_stream_chibi.cpp
+++ b/drivers/chibi/event_stream_chibi.cpp
@@ -779,8 +779,10 @@ EventStreamChibi::EventStreamChibi() {
 
 
 
-RES ResourceFormatLoaderChibi::load(const String &p_path,const String& p_original_path) {
+RES ResourceFormatLoaderChibi::load(const String &p_path, const String& p_original_path, Error *r_error) {
 
+	if (r_error)
+		*r_error=ERR_FILE_CANT_OPEN;
 	String el = p_path.extension().to_lower();
 
 	CPFileAccessWrapperImpl f;
@@ -791,6 +793,8 @@ RES ResourceFormatLoaderChibi::load(const String &p_path,const String& p_origina
 		CPLoader_IT loader(&f);
 		CPLoader::Error err = loader.load_song(p_path.utf8().get_data(),&esc->song,false);
 		ERR_FAIL_COND_V(err!=CPLoader::FILE_OK,RES());
+		if (r_error)
+			*r_error=OK;
 
 		return esc;
 
@@ -800,6 +804,8 @@ RES ResourceFormatLoaderChibi::load(const String &p_path,const String& p_origina
 		CPLoader_XM loader(&f);
 		CPLoader::Error err=loader.load_song(p_path.utf8().get_data(),&esc->song,false);
 		ERR_FAIL_COND_V(err!=CPLoader::FILE_OK,RES());
+		if (r_error)
+			*r_error=OK;
 		return esc;
 
 	} else if (el=="s3m") {
@@ -808,6 +814,9 @@ RES ResourceFormatLoaderChibi::load(const String &p_path,const String& p_origina
 		CPLoader_S3M loader(&f);
 		CPLoader::Error err=loader.load_song(p_path.utf8().get_data(),&esc->song,false);
 		ERR_FAIL_COND_V(err!=CPLoader::FILE_OK,RES());
+		if (r_error)
+			*r_error=OK;
+
 		return esc;
 
 	} else if (el=="mod") {
@@ -816,6 +825,8 @@ RES ResourceFormatLoaderChibi::load(const String &p_path,const String& p_origina
 		CPLoader_MOD loader(&f);
 		CPLoader::Error err=loader.load_song(p_path.utf8().get_data(),&esc->song,false);
 		ERR_FAIL_COND_V(err!=CPLoader::FILE_OK,RES());
+		if (r_error)
+			*r_error=OK;
 		return esc;
 	}
 
diff --git a/drivers/chibi/event_stream_chibi.h b/drivers/chibi/event_stream_chibi.h
index 7b2ee4b4713..b564c160184 100644
--- a/drivers/chibi/event_stream_chibi.h
+++ b/drivers/chibi/event_stream_chibi.h
@@ -301,7 +301,7 @@ public:
 class ResourceFormatLoaderChibi : public ResourceFormatLoader {
 
 public:
-	virtual RES load(const String &p_path,const String& p_original_path="");
+	virtual RES load(const String &p_path,const String& p_original_path="",Error *r_error=NULL);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual bool handles_type(const String& p_type) const;
 	virtual String get_resource_type(const String &p_path) const;
diff --git a/drivers/dds/texture_loader_dds.cpp b/drivers/dds/texture_loader_dds.cpp
index 8e6c3b62e6f..9b2e401fd94 100644
--- a/drivers/dds/texture_loader_dds.cpp
+++ b/drivers/dds/texture_loader_dds.cpp
@@ -64,8 +64,10 @@ static const DDSFormatInfo dds_format_info[DDS_MAX]={
 };
 
 
-RES ResourceFormatDDS::load(const String &p_path,const String& p_original_path) {
+RES ResourceFormatDDS::load(const String &p_path, const String& p_original_path, Error *r_error) {
 
+	if (r_error)
+		*r_error=ERR_CANT_OPEN;
 
 	Error err;
 	FileAccess *f = FileAccess::open(p_path,FileAccess::READ,&err);
@@ -73,6 +75,8 @@ RES ResourceFormatDDS::load(const String &p_path,const String& p_original_path)
 		return RES();
 
 	FileAccessRef fref(f);
+	if (r_error)
+		*r_error=ERR_FILE_CORRUPT;
 
 	ERR_EXPLAIN("Unable to open DDS texture file: "+p_path);
 	ERR_FAIL_COND_V(err!=OK,RES());
@@ -427,6 +431,10 @@ RES ResourceFormatDDS::load(const String &p_path,const String& p_original_path)
 	Ref<ImageTexture> texture = memnew( ImageTexture );
 	texture->create_from_image(img);
 
+	if (r_error)
+		*r_error=OK;
+
+
 	return texture;
 
 }
diff --git a/drivers/dds/texture_loader_dds.h b/drivers/dds/texture_loader_dds.h
index 18a14850737..c8b3610063b 100644
--- a/drivers/dds/texture_loader_dds.h
+++ b/drivers/dds/texture_loader_dds.h
@@ -7,7 +7,7 @@
 class ResourceFormatDDS : public ResourceFormatLoader{
 public:
 
-	virtual RES load(const String &p_path,const String& p_original_path="");
+	virtual RES load(const String &p_path,const String& p_original_path="",Error *r_error=NULL);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual bool handles_type(const String& p_type) const;
 	virtual String get_resource_type(const String &p_path) const;
diff --git a/drivers/gles2/shader_compiler_gles2.cpp b/drivers/gles2/shader_compiler_gles2.cpp
index 157f2e398b5..d57512c9363 100644
--- a/drivers/gles2/shader_compiler_gles2.cpp
+++ b/drivers/gles2/shader_compiler_gles2.cpp
@@ -132,18 +132,18 @@ String ShaderCompilerGLES2::dump_node_code(SL::Node *p_node,int p_level,bool p_a
 			SL::BlockNode *bnode=(SL::BlockNode*)p_node;
 
 			//variables
-			code+="{"ENDL;
+            code+="{" ENDL;
 			for(Map<StringName,SL::DataType>::Element *E=bnode->variables.front();E;E=E->next()) {
 
-				code+=_mktab(p_level)+_typestr(E->value())+" "+replace_string(E->key())+";"ENDL;
+                code+=_mktab(p_level)+_typestr(E->value())+" "+replace_string(E->key())+";" ENDL;
 			}
 
 			for(int i=0;i<bnode->statements.size();i++) {
 
-				code+=_mktab(p_level)+dump_node_code(bnode->statements[i],p_level)+";"ENDL;
+                code+=_mktab(p_level)+dump_node_code(bnode->statements[i],p_level)+";" ENDL;
 			}
 
-			code+="}"ENDL;
+            code+="}" ENDL;
 
 		} break;
 		case SL::Node::TYPE_VARIABLE: {
@@ -489,15 +489,15 @@ String ShaderCompilerGLES2::dump_node_code(SL::Node *p_node,int p_level,bool p_a
 			SL::ControlFlowNode *cfnode=(SL::ControlFlowNode*)p_node;
 			if (cfnode->flow_op==SL::FLOW_OP_IF) {
 
-				code+="if ("+dump_node_code(cfnode->statements[0],p_level)+") {"ENDL;
+                code+="if ("+dump_node_code(cfnode->statements[0],p_level)+") {" ENDL;
 				code+=dump_node_code(cfnode->statements[1],p_level+1);
 				if (cfnode->statements.size()==3) {
 
-					code+="} else {"ENDL;
+                    code+="} else {" ENDL;
 					code+=dump_node_code(cfnode->statements[2],p_level+1);
 				}
 
-				code+="}"ENDL;
+                code+="}" ENDL;
 
 			} else if (cfnode->flow_op==SL::FLOW_OP_RETURN) {
 
@@ -560,7 +560,7 @@ Error ShaderCompilerGLES2::compile_node(SL::ProgramNode *p_program) {
 		ubase=uniforms->size();
 	for(Map<StringName,SL::Uniform>::Element *E=p_program->uniforms.front();E;E=E->next()) {
 
-		String uline="uniform "+_typestr(E->get().type)+" _"+E->key().operator String()+";"ENDL;
+        String uline="uniform "+_typestr(E->get().type)+" _"+E->key().operator String()+";" ENDL;
 
 		global_code+=uline;
 		if (uniforms) {
@@ -593,10 +593,10 @@ Error ShaderCompilerGLES2::compile_node(SL::ProgramNode *p_program) {
 			header+=_typestr(fnode->arguments[i].type)+" "+replace_string(fnode->arguments[i].name);
 		}
 
-		header+=") {"ENDL;
+        header+=") {" ENDL;
 		String fcode=header;
 		fcode+=dump_node_code(fnode->body,1);
-		fcode+="}"ENDL;
+        fcode+="}" ENDL;
 		global_code+=fcode;
 
 	}
@@ -605,7 +605,7 @@ Error ShaderCompilerGLES2::compile_node(SL::ProgramNode *p_program) {
 
 		StringName varname=E->key();
 		String newvarname=replace_string(varname);
-		global_code+="uniform "+_typestr(E->get())+" "+newvarname+";"ENDL;
+        global_code+="uniform "+_typestr(E->get())+" "+newvarname+";" ENDL;
 	}*/
 
 	code=dump_node_code(p_program,0);
diff --git a/drivers/mpc/audio_stream_mpc.cpp b/drivers/mpc/audio_stream_mpc.cpp
index cd8125c9af9..67f21f922c0 100644
--- a/drivers/mpc/audio_stream_mpc.cpp
+++ b/drivers/mpc/audio_stream_mpc.cpp
@@ -366,8 +366,9 @@ AudioStreamMPC::~AudioStreamMPC() {
 
 
 
-RES ResourceFormatLoaderAudioStreamMPC::load(const String &p_path,const String& p_original_path) {
-
+RES ResourceFormatLoaderAudioStreamMPC::load(const String &p_path, const String& p_original_path, Error *r_error) {
+	if (r_error)
+		*r_error=OK; //streamed so it will always work..
 	AudioStreamMPC *mpc_stream = memnew(AudioStreamMPC);
 	mpc_stream->set_file(p_path);
 	return Ref<AudioStreamMPC>(mpc_stream);
diff --git a/drivers/mpc/audio_stream_mpc.h b/drivers/mpc/audio_stream_mpc.h
index fa949acd008..8fb0ed13de4 100644
--- a/drivers/mpc/audio_stream_mpc.h
+++ b/drivers/mpc/audio_stream_mpc.h
@@ -88,7 +88,7 @@ public:
 
 class ResourceFormatLoaderAudioStreamMPC : public ResourceFormatLoader {
 public:
-	virtual RES load(const String &p_path,const String& p_original_path="");
+	virtual RES load(const String &p_path,const String& p_original_path="",Error *r_error=NULL);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual bool handles_type(const String& p_type) const;
 	virtual String get_resource_type(const String &p_path) const;
diff --git a/drivers/pvr/texture_loader_pvr.cpp b/drivers/pvr/texture_loader_pvr.cpp
index 5268b953f4d..eb67dad8cf0 100644
--- a/drivers/pvr/texture_loader_pvr.cpp
+++ b/drivers/pvr/texture_loader_pvr.cpp
@@ -22,8 +22,10 @@ enum PVRFLags {
 
 
 
-RES ResourceFormatPVR::load(const String &p_path,const String& p_original_path) {
+RES ResourceFormatPVR::load(const String &p_path,const String& p_original_path,Error *r_error) {
 
+	if (r_error)
+		*r_error=ERR_CANT_OPEN;
 
 	Error err;
 	FileAccess *f = FileAccess::open(p_path,FileAccess::READ,&err);
@@ -34,6 +36,8 @@ RES ResourceFormatPVR::load(const String &p_path,const String& p_original_path)
 
 	ERR_FAIL_COND_V(err,RES());
 
+	if (r_error)
+		*r_error=ERR_FILE_CORRUPT;
 
 	uint32_t hsize = f->get_32();
 
@@ -135,6 +139,9 @@ RES ResourceFormatPVR::load(const String &p_path,const String& p_original_path)
 	Ref<ImageTexture> texture = memnew( ImageTexture );
 	texture->create_from_image(image,tex_flags);
 
+	if (r_error)
+		*r_error=OK;
+
 	return texture;
 
 }
diff --git a/drivers/pvr/texture_loader_pvr.h b/drivers/pvr/texture_loader_pvr.h
index ad86660aa16..735cb2b48bd 100644
--- a/drivers/pvr/texture_loader_pvr.h
+++ b/drivers/pvr/texture_loader_pvr.h
@@ -9,7 +9,7 @@
 class ResourceFormatPVR : public ResourceFormatLoader{
 public:
 
-	virtual RES load(const String &p_path,const String& p_original_path);
+	virtual RES load(const String &p_path,const String& p_original_path,Error *r_error=NULL);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual bool handles_type(const String& p_type) const;
 	virtual String get_resource_type(const String &p_path) const;
diff --git a/drivers/speex/audio_stream_speex.cpp b/drivers/speex/audio_stream_speex.cpp
index bcf4c515f80..2cffb170494 100644
--- a/drivers/speex/audio_stream_speex.cpp
+++ b/drivers/speex/audio_stream_speex.cpp
@@ -530,7 +530,10 @@ AudioStreamSpeex::~AudioStreamSpeex() {
 	unload();
 }
 
-RES ResourceFormatLoaderAudioStreamSpeex::load(const String &p_path,const String& p_original_path) {
+RES ResourceFormatLoaderAudioStreamSpeex::load(const String &p_path, const String& p_original_path, Error *r_error) {
+
+	if (r_error)
+		*r_error=OK;
 
 	AudioStreamSpeex *stream = memnew(AudioStreamSpeex);
 	stream->set_file(p_path);
diff --git a/drivers/speex/audio_stream_speex.h b/drivers/speex/audio_stream_speex.h
index 9557ebe0b81..f9e0fce6660 100644
--- a/drivers/speex/audio_stream_speex.h
+++ b/drivers/speex/audio_stream_speex.h
@@ -91,7 +91,7 @@ public:
 
 class ResourceFormatLoaderAudioStreamSpeex : public ResourceFormatLoader {
 public:
-	virtual RES load(const String &p_path,const String& p_original_path="");
+	virtual RES load(const String &p_path,const String& p_original_path="",Error *r_error=NULL);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual bool handles_type(const String& p_type) const;
 	virtual String get_resource_type(const String &p_path) const;
diff --git a/drivers/theora/video_stream_theora.h b/drivers/theora/video_stream_theora.h
index b408f9db136..12aac731fc6 100644
--- a/drivers/theora/video_stream_theora.h
+++ b/drivers/theora/video_stream_theora.h
@@ -102,7 +102,7 @@ public:
 
 class ResourceFormatLoaderVideoStreamTheora : public ResourceFormatLoader {
 public:
-	virtual RES load(const String &p_path,const String& p_original_path="");
+	virtual RES load(const String &p_path,const String& p_original_path="",Error *r_error=NULL);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual bool handles_type(const String& p_type) const;
 	virtual String get_resource_type(const String &p_path) const;
diff --git a/drivers/theoraplayer/src/YUV/libyuv/src/cpu_id.cc b/drivers/theoraplayer/src/YUV/libyuv/src/cpu_id.cc
index f52bd955518..aac7390b32c 100755
--- a/drivers/theoraplayer/src/YUV/libyuv/src/cpu_id.cc
+++ b/drivers/theoraplayer/src/YUV/libyuv/src/cpu_id.cc
@@ -174,7 +174,7 @@ int cpu_info_ = kCpuInit;  // cpu_info is not initialized yet.
 #if !defined(__native_client__) && !defined(_M_ARM)
 
 static LIBYUV_BOOL TestEnv(const char* name) {
-#ifndef _WINRT
+#if !defined(_WINRT) && !defined(ORBIS_ENABLED)
   const char* var = getenv(name);
   if (var) {
     if (var[0] != '0') {
diff --git a/drivers/theoraplayer/video_stream_theoraplayer.cpp b/drivers/theoraplayer/video_stream_theoraplayer.cpp
index ef1f5651ab3..876cac3425c 100644
--- a/drivers/theoraplayer/video_stream_theoraplayer.cpp
+++ b/drivers/theoraplayer/video_stream_theoraplayer.cpp
@@ -525,7 +525,9 @@ VideoStreamTheoraplayer::VideoStreamTheoraplayer() {
 };
 
 
-RES ResourceFormatLoaderVideoStreamTheoraplayer::load(const String &p_path,const String& p_original_path) {
+RES ResourceFormatLoaderVideoStreamTheoraplayer::load(const String &p_path, const String& p_original_path, Error *r_error) {
+	if (r_error)
+		*r_error=OK;
 
 	VideoStreamTheoraplayer *stream = memnew(VideoStreamTheoraplayer);
 	stream->set_file(p_path);
diff --git a/drivers/theoraplayer/video_stream_theoraplayer.h b/drivers/theoraplayer/video_stream_theoraplayer.h
index d43c12609fe..69cae7c4a26 100644
--- a/drivers/theoraplayer/video_stream_theoraplayer.h
+++ b/drivers/theoraplayer/video_stream_theoraplayer.h
@@ -54,7 +54,7 @@ public:
 
 class ResourceFormatLoaderVideoStreamTheoraplayer : public ResourceFormatLoader {
 public:
-	virtual RES load(const String &p_path,const String& p_original_path="");
+	virtual RES load(const String &p_path,const String& p_original_path="",Error *r_error=NULL);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual bool handles_type(const String& p_type) const;
 	virtual String get_resource_type(const String &p_path) const;
diff --git a/drivers/vorbis/audio_stream_ogg_vorbis.cpp b/drivers/vorbis/audio_stream_ogg_vorbis.cpp
index 249059e2c1f..ee9ba8da4d5 100644
--- a/drivers/vorbis/audio_stream_ogg_vorbis.cpp
+++ b/drivers/vorbis/audio_stream_ogg_vorbis.cpp
@@ -385,7 +385,9 @@ AudioStreamOGGVorbis::~AudioStreamOGGVorbis() {
 
 
 
-RES ResourceFormatLoaderAudioStreamOGGVorbis::load(const String &p_path,const String& p_original_path) {
+RES ResourceFormatLoaderAudioStreamOGGVorbis::load(const String &p_path, const String& p_original_path, Error *r_error) {
+	if (r_error)
+		*r_error=OK;
 
 	AudioStreamOGGVorbis *ogg_stream = memnew(AudioStreamOGGVorbis);
 	ogg_stream->set_file(p_path);
diff --git a/drivers/vorbis/audio_stream_ogg_vorbis.h b/drivers/vorbis/audio_stream_ogg_vorbis.h
index 8a35fc09cbf..5e3649d9803 100644
--- a/drivers/vorbis/audio_stream_ogg_vorbis.h
+++ b/drivers/vorbis/audio_stream_ogg_vorbis.h
@@ -111,7 +111,7 @@ public:
 
 class ResourceFormatLoaderAudioStreamOGGVorbis : public ResourceFormatLoader {
 public:
-	virtual RES load(const String &p_path,const String& p_original_path="");
+	virtual RES load(const String &p_path,const String& p_original_path="",Error *r_error=NULL);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual bool handles_type(const String& p_type) const;
 	virtual String get_resource_type(const String &p_path) const;
diff --git a/main/main.cpp b/main/main.cpp
index 19ee1c115fc..452e95660fb 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -75,7 +75,7 @@
 #include "core/io/file_access_zip.h"
 #include "translation.h"
 #include "version.h"
-
+#include "os/input.h"
 #include "performance.h"
 
 static Globals *globals=NULL;
@@ -94,11 +94,15 @@ static FileAccessNetworkClient *file_access_network_client=NULL;
 static TranslationServer *translation_server = NULL;
 
 static OS::VideoMode video_mode;
+static bool init_maximized=false;
+static bool init_fullscreen=false;
+static bool init_use_custom_pos=false;
+static Vector2 init_custom_pos;
 static int video_driver_idx=-1;
 static int audio_driver_idx=-1;
 static String locale;
 
-static bool init_maximized=false;
+
 static int init_screen=-1;
 
 static String unescape_cmdline(const String& p_str) {
@@ -136,8 +140,10 @@ void Main::print_help(const char* p_binary) {
 	}
 	OS::get_singleton()->print(")\n");
 	
-	OS::get_singleton()->print("\t-r WIDTHxHEIGHT\t : Request Screen Resolution\n");
+	OS::get_singleton()->print("\t-r WIDTHxHEIGHT\t : Request Window Resolution\n");
+	OS::get_singleton()->print("\t-p XxY\t : Request Window Position\n");
 	OS::get_singleton()->print("\t-f\t\t : Request Fullscreen\n");
+	OS::get_singleton()->print("\t-mx\t\t Request Maximized\n");
 	OS::get_singleton()->print("\t-vd DRIVER\t : Video Driver (");
 	for (int i=0;i<OS::get_singleton()->get_video_driver_count();i++) {
 		
@@ -311,7 +317,37 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas
 				
 			
 			}
-			
+		} else if (I->get()=="-p") { // position
+
+			if (I->next()) {
+
+				String vm=I->next()->get();
+
+				if (vm.find("x")==-1) { // invalid parameter format
+
+					goto error;
+
+
+				}
+
+				int x=vm.get_slice("x",0).to_int();
+				int y=vm.get_slice("x",1).to_int();
+
+				init_custom_pos=Point2(x,y);
+				init_use_custom_pos=true;
+				force_res=true;
+
+				N=I->next()->next();
+			} else {
+				goto error;
+
+
+			}
+
+
+		} else if (I->get()=="-mx") { // video driver
+
+			init_maximized=true;
 		} else if (I->get()=="-vd") { // video driver
 		
 			if (I->next()) {
@@ -383,7 +419,8 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas
 			
 		} else if (I->get()=="-f") { // fullscreen
 		
-			video_mode.fullscreen=true;
+			//video_mode.fullscreen=false;
+			init_fullscreen=true;
 		} else if (I->get()=="-e" || I->get()=="-editor") { // fonud editor
 
 			editor=true;
@@ -785,6 +822,14 @@ Error Main::setup2() {
 
 
 	OS::get_singleton()->initialize(video_mode,video_driver_idx,audio_driver_idx);
+	if (init_use_custom_pos) {
+		OS::get_singleton()->set_window_position(init_custom_pos);
+	}
+	if (init_maximized) {
+		OS::get_singleton()->set_window_maximized(true);
+	} else if (init_fullscreen) {
+		OS::get_singleton()->set_window_fullscreen(true);
+	}
 
 	register_core_singletons();
 
@@ -801,17 +846,29 @@ Error Main::setup2() {
 	if (init_maximized) {
 		OS::get_singleton()->set_window_maximized(true);
 	}
+	MAIN_PRINT("Main: Load Remaps");
+
+	path_remap->load_remaps();
 
 	if (show_logo) { //boot logo!
 		String boot_logo_path=GLOBAL_DEF("application/boot_splash",String());
 		bool boot_logo_scale=GLOBAL_DEF("application/boot_splash_fullsize",true);
 		Globals::get_singleton()->set_custom_property_info("application/boot_splash",PropertyInfo(Variant::STRING,"application/boot_splash",PROPERTY_HINT_FILE,"*.png"));
-
+		print_line("BOOT SPLASH: "+boot_logo_path);
 
 		Image boot_logo;
 
-		if (boot_logo_path.strip_edges()!="" && FileAccess::exists(boot_logo_path)) {
-			boot_logo.load(boot_logo_path);
+		boot_logo_path = boot_logo_path.strip_edges();
+		print_line("BOOT SPLASH IS : "+boot_logo_path);
+
+		if (boot_logo_path!=String() /*&& FileAccess::exists(boot_logo_path)*/) {
+			Error err = boot_logo.load(boot_logo_path);
+			if (err!=OK) {
+				print_line("ËRROR LOADING BOOT LOGO SPLASH :"+boot_logo_path);
+			} else {
+				print_line("BOOT SPLASH OK!");
+
+			}
 		}
 
 		if (!boot_logo.empty()) {
@@ -822,7 +879,7 @@ Error Main::setup2() {
 			VisualServer::get_singleton()->set_boot_image(boot_logo, boot_bg,boot_logo_scale);
 #ifndef TOOLS_ENABLED
 			//no tools, so free the boot logo (no longer needed)
-			Globals::get_singleton()->set("application/boot_logo",Image());
+		//	Globals::get_singleton()->set("application/boot_logo",Image());
 #endif
 
 		} else {
@@ -847,10 +904,16 @@ Error Main::setup2() {
 	GLOBAL_DEF("application/icon",String());
 	Globals::get_singleton()->set_custom_property_info("application/icon",PropertyInfo(Variant::STRING,"application/icon",PROPERTY_HINT_FILE,"*.png,*.webp"));
 
+	if (bool(GLOBAL_DEF("display/emulate_touchscreen",false))) {
+		if (!OS::get_singleton()->has_touchscreen_ui_hint() && Input::get_singleton()) {
+			//only if no touchscreen ui hint, set emulation
+			InputDefault *id = Input::get_singleton()->cast_to<InputDefault>();
+			if (id)
+				id->set_emulate_touch(true);
+		}
+	}
 	MAIN_PRINT("Main: Load Remaps");
 
-	path_remap->load_remaps();
-
 	MAIN_PRINT("Main: Load Scene Types");
 
 	register_scene_types();
diff --git a/modules/gdscript/gd_editor.cpp b/modules/gdscript/gd_editor.cpp
index 7cb9882f3ac..0d986e92a25 100644
--- a/modules/gdscript/gd_editor.cpp
+++ b/modules/gdscript/gd_editor.cpp
@@ -998,6 +998,44 @@ static bool _guess_identifier_type_in_block(GDCompletionContext& context,int p_l
 	return false;
 }
 
+
+static bool _guess_identifier_from_assignment_in_function(GDCompletionContext& context,const StringName& p_identifier, const StringName& p_function,GDCompletionIdentifier &r_type) {
+
+	const GDParser::FunctionNode* func=NULL;
+	for(int i=0;i<context._class->functions.size();i++) {
+		if (context._class->functions[i]->name==p_function) {
+			func=context._class->functions[i];
+			break;
+		}
+	}
+
+	if (!func)
+		return false;
+
+	for(int i=0;i<func->body->statements.size();i++) {
+
+
+
+		if (func->body->statements[i]->type==GDParser::BlockNode::TYPE_OPERATOR) {
+			const GDParser::OperatorNode *op = static_cast<const GDParser::OperatorNode *>(func->body->statements[i]);
+			if (op->op==GDParser::OperatorNode::OP_ASSIGN) {
+
+				if (op->arguments.size() && op->arguments[0]->type==GDParser::Node::TYPE_IDENTIFIER) {
+
+					const GDParser::IdentifierNode *id = static_cast<const GDParser::IdentifierNode *>(op->arguments[0]);
+
+					if (id->name==p_identifier) {
+
+						return _guess_expression_type(context,op->arguments[1],func->body->statements[i]->line,r_type);
+					}
+				}
+			}
+		}
+	}
+
+	return false;
+}
+
 static bool _guess_identifier_type(GDCompletionContext& context,int p_line,const StringName& p_identifier,GDCompletionIdentifier &r_type) {
 
 	//go to block first
@@ -1089,8 +1127,22 @@ static bool _guess_identifier_type(GDCompletionContext& context,int p_line,const
 					r_type=_get_type_from_pinfo(context._class->variables[i]._export);
 					return true;
 				} else if (context._class->variables[i].expression) {
-					return _guess_expression_type(context,context._class->variables[i].expression,context._class->variables[i].line,r_type);
+
+					bool rtype = _guess_expression_type(context,context._class->variables[i].expression,context._class->variables[i].line,r_type);
+					if (rtype && r_type.type!=Variant::NIL)
+						return true;
+					//return _guess_expression_type(context,context._class->variables[i].expression,context._class->variables[i].line,r_type);
 				}
+
+				//try to guess from assignment in construtor or _ready
+				if (_guess_identifier_from_assignment_in_function(context,p_identifier,"_ready",r_type))
+					return true;
+				if (_guess_identifier_from_assignment_in_function(context,p_identifier,"_enter_tree",r_type))
+					return true;
+				if (_guess_identifier_from_assignment_in_function(context,p_identifier,"_init",r_type))
+					return true;
+
+				return false;
 			}
 		}
 	}
diff --git a/modules/gdscript/gd_parser.cpp b/modules/gdscript/gd_parser.cpp
index f7aaaf7ee5c..9c39051b7f9 100644
--- a/modules/gdscript/gd_parser.cpp
+++ b/modules/gdscript/gd_parser.cpp
@@ -170,6 +170,7 @@ void GDParser::_make_completable_call(int p_arg) {
 	completion_line=tokenizer->get_token_line();
 	completion_argument=p_arg;
 	completion_block=current_block;
+	completion_found=true;
 	tokenizer->advance();
 
 }
@@ -190,6 +191,7 @@ bool GDParser::_get_completable_identifier(CompletionType p_type,StringName& ide
 		completion_function=current_function;
 		completion_line=tokenizer->get_token_line();
 		completion_block=current_block;
+		completion_found=true;
 		tokenizer->advance();
 
 		if (tokenizer->get_token()==GDTokenizer::TK_IDENTIFIER) {
@@ -1414,6 +1416,24 @@ GDParser::Node* GDParser::_parse_and_reduce_expression(Node *p_parent,bool p_sta
 	return expr;
 }
 
+bool GDParser::_recover_from_completion() {
+
+	if (!completion_found) {
+		return false; //can't recover if no completion
+	}
+	//skip stuff until newline
+	while(tokenizer->get_token()!=GDTokenizer::TK_NEWLINE && tokenizer->get_token()!=GDTokenizer::TK_EOF && tokenizer->get_token()!=GDTokenizer::TK_ERROR) {
+		tokenizer->advance();
+	}
+	completion_found=false;
+	error_set=false;
+	if(tokenizer->get_token() == GDTokenizer::TK_ERROR){
+		error_set = true;
+	}
+
+	return true;
+}
+
 void GDParser::_parse_block(BlockNode *p_block,bool p_static) {
 
 	int indent_level = tab_level.back()->get();
@@ -1511,8 +1531,14 @@ void GDParser::_parse_block(BlockNode *p_block,bool p_static) {
 					Node *subexpr=NULL;
 
 					subexpr = _parse_and_reduce_expression(p_block,p_static);
-					if (!subexpr)
+					if (!subexpr) {
+						if (_recover_from_completion()) {
+							break;
+						}
 						return;
+					}
+
+
 
 					lv->assign=subexpr;
 					assigned=subexpr;
@@ -1543,8 +1569,12 @@ void GDParser::_parse_block(BlockNode *p_block,bool p_static) {
 
 				tokenizer->advance();
 				Node *condition = _parse_and_reduce_expression(p_block,p_static);
-				if (!condition)
+				if (!condition) {
+					if (_recover_from_completion()) {
+						break;
+					}
 					return;
+				}
 
 				ControlFlowNode *cf_if = alloc_node<ControlFlowNode>();
 
@@ -1598,8 +1628,12 @@ void GDParser::_parse_block(BlockNode *p_block,bool p_static) {
 
 						//condition
 						Node *condition = _parse_and_reduce_expression(p_block,p_static);
-						if (!condition)
+						if (!condition) {
+							if (_recover_from_completion()) {
+								break;
+							}
 							return;
+						}
 						cf_else->arguments.push_back(condition);
 						cf_else->cf_type=ControlFlowNode::CF_IF;
 
@@ -1660,8 +1694,12 @@ void GDParser::_parse_block(BlockNode *p_block,bool p_static) {
 
 				tokenizer->advance();
 				Node *condition = _parse_and_reduce_expression(p_block,p_static);
-				if (!condition)
+				if (!condition) {
+					if (_recover_from_completion()) {
+						break;
+					}
 					return;
+				}
 
 				ControlFlowNode *cf_while = alloc_node<ControlFlowNode>();
 
@@ -1706,8 +1744,12 @@ void GDParser::_parse_block(BlockNode *p_block,bool p_static) {
 				tokenizer->advance();
 
 				Node *container = _parse_and_reduce_expression(p_block,p_static);
-				if (!container)
+				if (!container) {
+					if (_recover_from_completion()) {
+						break;
+					}
 					return;
+				}
 
 				ControlFlowNode *cf_for = alloc_node<ControlFlowNode>();
 
@@ -1771,8 +1813,12 @@ void GDParser::_parse_block(BlockNode *p_block,bool p_static) {
 				} else {
 					//expect expression
 					Node *retexpr = _parse_and_reduce_expression(p_block,p_static);
-					if (!retexpr)
+					if (!retexpr) {
+						if (_recover_from_completion()) {
+							break;
+						}
 						return;
+					}
 					cf_return->arguments.push_back(retexpr);
 					p_block->statements.push_back(cf_return);
 					if (!_end_statement()) {
@@ -1787,8 +1833,12 @@ void GDParser::_parse_block(BlockNode *p_block,bool p_static) {
 
 				tokenizer->advance();
 				Node *condition = _parse_and_reduce_expression(p_block,p_static);
-				if (!condition)
+				if (!condition) {
+					if (_recover_from_completion()) {
+						break;
+					}
 					return;
+				}
 				AssertNode *an = alloc_node<AssertNode>();
 				an->condition=condition;
 				p_block->statements.push_back(an);
@@ -1801,8 +1851,12 @@ void GDParser::_parse_block(BlockNode *p_block,bool p_static) {
 			default: {
 
 				Node *expression = _parse_and_reduce_expression(p_block,p_static,false,true);
-				if (!expression)
+				if (!expression) {
+					if (_recover_from_completion()) {
+						break;
+					}
 					return;
+				}
 				p_block->statements.push_back(expression);
 				if (!_end_statement()) {
 					_set_error("Expected end of statement after expression.");
@@ -2625,14 +2679,18 @@ void GDParser::_parse_class(ClassNode *p_class) {
 
 					Node *subexpr=NULL;
 
-					subexpr = _parse_and_reduce_expression(p_class,false);
-					if (!subexpr)
+					subexpr = _parse_and_reduce_expression(p_class,false,autoexport);
+					if (!subexpr) {
+						if (_recover_from_completion()) {
+							break;
+						}
 						return;
+					}
 
 					member.expression=subexpr;
 
 					if (autoexport) {
-						if (subexpr->type==Node::TYPE_ARRAY) {
+						if (1)/*(subexpr->type==Node::TYPE_ARRAY) {
 
 							member._export.type=Variant::ARRAY;
 
@@ -2640,7 +2698,7 @@ void GDParser::_parse_class(ClassNode *p_class) {
 
 							member._export.type=Variant::DICTIONARY;
 
-						} else {
+						} else*/ {
 
 							if (subexpr->type!=Node::TYPE_CONSTANT) {
 
@@ -2756,8 +2814,12 @@ void GDParser::_parse_class(ClassNode *p_class) {
 				Node *subexpr=NULL;
 
 				subexpr = _parse_and_reduce_expression(p_class,true,true);
-				if (!subexpr)
+				if (!subexpr) {
+					if (_recover_from_completion()) {
+						break;
+					}
 					return;
+				}
 
 				if (subexpr->type!=Node::TYPE_CONSTANT) {
 					_set_error("Expected constant expression");
@@ -2852,6 +2914,7 @@ Error GDParser::parse_bytecode(const Vector<uint8_t> &p_bytecode,const String& p
 	completion_class=NULL;
 	completion_function=NULL;
 	completion_block=NULL;
+	completion_found=false;
 	current_block=NULL;
 	current_class=NULL;
 	current_function=NULL;
@@ -2874,6 +2937,7 @@ Error GDParser::parse(const String& p_code, const String& p_base_path, bool p_ju
 	completion_class=NULL;
 	completion_function=NULL;
 	completion_block=NULL;
+	completion_found=false;
 	current_block=NULL;
 	current_class=NULL;
 
@@ -2917,6 +2981,8 @@ void GDParser::clear() {
 	current_block=NULL;
 	current_class=NULL;
 
+	completion_found=false;
+
 	current_function=NULL;
 
 	validating=false;
diff --git a/modules/gdscript/gd_parser.h b/modules/gdscript/gd_parser.h
index fd8a2576fa3..134279b6d82 100644
--- a/modules/gdscript/gd_parser.h
+++ b/modules/gdscript/gd_parser.h
@@ -419,10 +419,12 @@ private:
 	BlockNode *completion_block;
 	int completion_line;
 	int completion_argument;
+	bool completion_found;
 
 	PropertyInfo current_export;
 
 	void _set_error(const String& p_error, int p_line=-1, int p_column=-1);
+	bool _recover_from_completion();
 
 
 	bool _parse_arguments(Node* p_parent, Vector<Node*>& p_args, bool p_static, bool p_can_codecomplete=false);
diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp
index 53ae0c87021..99ddc74bb4b 100644
--- a/modules/gdscript/gd_script.cpp
+++ b/modules/gdscript/gd_script.cpp
@@ -2710,7 +2710,10 @@ GDScriptLanguage::~GDScriptLanguage() {
 
 /*************** RESOURCE ***************/
 
-RES ResourceFormatLoaderGDScript::load(const String &p_path,const String& p_original_path) {
+RES ResourceFormatLoaderGDScript::load(const String &p_path, const String& p_original_path, Error *r_error) {
+
+	if (r_error)
+		*r_error=ERR_FILE_CANT_OPEN;
 
 	GDScript *script = memnew( GDScript );
 
@@ -2742,6 +2745,8 @@ RES ResourceFormatLoaderGDScript::load(const String &p_path,const String& p_orig
 
 		script->reload();
 	}
+	if (r_error)
+		*r_error=OK;
 
 	return scriptres;
 }
diff --git a/modules/gdscript/gd_script.h b/modules/gdscript/gd_script.h
index fe325ff71e1..37ef47af6c0 100644
--- a/modules/gdscript/gd_script.h
+++ b/modules/gdscript/gd_script.h
@@ -557,7 +557,7 @@ public:
 class ResourceFormatLoaderGDScript : public ResourceFormatLoader {
 public:
 
-	virtual RES load(const String &p_path,const String& p_original_path="");
+	virtual RES load(const String &p_path,const String& p_original_path="",Error *r_error=NULL);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual bool handles_type(const String& p_type) const;
 	virtual String get_resource_type(const String &p_path) const;
diff --git a/platform/android/detect.py b/platform/android/detect.py
index 76575a1ec6b..fce1fe3ed6c 100644
--- a/platform/android/detect.py
+++ b/platform/android/detect.py
@@ -173,8 +173,7 @@ def configure(env):
 	env.Append(LDPATH=[ld_path])
 	env.Append(LIBS=['OpenSLES'])
 #	env.Append(LIBS=['c','m','stdc++','log','EGL','GLESv1_CM','GLESv2','OpenSLES','supc++','android'])
-	if (env["ndk_platform"]!="2.2"):
-		env.Append(LIBS=['EGL','OpenSLES','android'])
+	env.Append(LIBS=['EGL','OpenSLES','android'])
 	env.Append(LIBS=['c','m','stdc++','log','GLESv1_CM','GLESv2', 'z'])
 
 	env["LINKFLAGS"]= string.split(" -g --sysroot="+ld_sysroot+" -Wl,--no-undefined -Wl,-z,noexecstack ")
diff --git a/platform/android/file_access_android.cpp b/platform/android/file_access_android.cpp
index da3a37fb42f..ff70d5ae764 100644
--- a/platform/android/file_access_android.cpp
+++ b/platform/android/file_access_android.cpp
@@ -29,16 +29,16 @@
 #include "file_access_android.h"
 #include "print_string.h"
 
-#ifdef ANDROID_NATIVE_ACTIVITY
+
 
 
 AAssetManager *FileAccessAndroid::asset_manager=NULL;
 
 
-void FileAccessAndroid::make_default() {
+/*void FileAccessAndroid::make_default() {
 
 	create_func=create_android;
-}
+}*/
 
 FileAccess* FileAccessAndroid::create_android() {
 
@@ -46,7 +46,7 @@ FileAccess* FileAccessAndroid::create_android() {
 }
 
 
-Error FileAccessAndroid::open(const String& p_path, int p_mode_flags) {
+Error FileAccessAndroid::_open(const String& p_path, int p_mode_flags) {
 
 	String path=fix_path(p_path).simplify_path();
 	if (path.begins_with("/"))
@@ -55,7 +55,6 @@ Error FileAccessAndroid::open(const String& p_path, int p_mode_flags) {
 		path=path.substr(6,path.length());
 
 
-
 	ERR_FAIL_COND_V(p_mode_flags&FileAccess::WRITE,ERR_UNAVAILABLE); //can't write on android..
 	a=AAssetManager_open(asset_manager,path.utf8().get_data(),AASSET_MODE_STREAMING);
 	if (!a)
@@ -184,4 +183,4 @@ FileAccessAndroid::~FileAccessAndroid()
 {
 	close();
 }
-#endif
+
diff --git a/platform/android/file_access_android.h b/platform/android/file_access_android.h
index f477920ae99..506c2c023fc 100644
--- a/platform/android/file_access_android.h
+++ b/platform/android/file_access_android.h
@@ -29,14 +29,13 @@
 #ifndef FILE_ACCESS_ANDROID_H
 #define FILE_ACCESS_ANDROID_H
 
-#ifdef ANDROID_NATIVE_ACTIVITY
 
 
 #include "os/file_access.h"
 #include <stdio.h>
 #include <android/asset_manager.h>
 #include <android/log.h>
-#include <android_native_app_glue.h>
+//#include <android_native_app_glue.h>
 
 
 class FileAccessAndroid : public FileAccess {
@@ -51,7 +50,7 @@ public:
 
 	static AAssetManager *asset_manager;
 
-	virtual Error open(const String& p_path, int p_mode_flags); ///< open a file
+	virtual Error _open(const String& p_path, int p_mode_flags); ///< open a file
 	virtual void close(); ///< close a file
 	virtual bool is_open() const; ///< true when file is open
 
@@ -71,12 +70,13 @@ public:
 
 	virtual bool file_exists(const String& p_path); ///< return true if a file exists
 
+	virtual uint64_t _get_modified_time(const String& p_file) { return 0; }
 
-	static void make_default();
+	//static void make_default();
 
 	FileAccessAndroid();
 	~FileAccessAndroid();
 };
 
 #endif // FILE_ACCESS_ANDROID_H
-#endif
+
diff --git a/platform/android/file_access_jandroid.cpp b/platform/android/file_access_jandroid.cpp
index 971d4f84ab2..be38d806b2f 100644
--- a/platform/android/file_access_jandroid.cpp
+++ b/platform/android/file_access_jandroid.cpp
@@ -62,13 +62,15 @@ Error FileAccessJAndroid::_open(const String& p_path, int p_mode_flags) {
 
 	JNIEnv *env = ThreadAndroid::get_env();
 
-	//OS::get_singleton()->print("env: %p, io %p, fo: %p\n",env,io,_file_open);
 
 
 	jstring js = env->NewStringUTF(path.utf8().get_data());
 	int res = env->CallIntMethod(io,_file_open,js,p_mode_flags&WRITE?true:false);
 	env->DeleteLocalRef(js);
 
+	OS::get_singleton()->print("fopen: '%s' ret %i\n",path.utf8().get_data(),res);
+
+
 	if (res<=0)
 		return ERR_FILE_CANT_OPEN;
 	id=res;
diff --git a/platform/android/java/src/com/android/godot/Godot.java b/platform/android/java/src/com/android/godot/Godot.java
index 9b9b1ab2ada..4c5a3135764 100644
--- a/platform/android/java/src/com/android/godot/Godot.java
+++ b/platform/android/java/src/com/android/godot/Godot.java
@@ -357,7 +357,7 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC
 		        Log.d("GODOT","   " + command_line[w]);
 		    }
 		}*/
-		GodotLib.initialize(this,io.needsReloadHooks(),command_line);
+		GodotLib.initialize(this,io.needsReloadHooks(),command_line,getAssets());
 		mSensorManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
 		mAccelerometer = mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
 		mSensorManager.registerListener(this, mAccelerometer, SensorManager.SENSOR_DELAY_GAME);
diff --git a/platform/android/java/src/com/android/godot/GodotIO.java b/platform/android/java/src/com/android/godot/GodotIO.java
index addceb15286..a7dc0c2f756 100644
--- a/platform/android/java/src/com/android/godot/GodotIO.java
+++ b/platform/android/java/src/com/android/godot/GodotIO.java
@@ -94,6 +94,7 @@ public class GodotIO {
 
 		//System.out.printf("file_open: Attempt to Open %s\n",path);
 
+		//Log.v("MyApp", "TRYING TO OPEN FILE: " + path);
 		if (write)
 			return -1;
 
@@ -105,7 +106,7 @@ public class GodotIO {
 
 		} catch (Exception e) {
 
-			//System.out.printf("Exception on file_open: %s\n",e);
+			//System.out.printf("Exception on file_open: %s\n",path);
 			return -1;
 		}
 
@@ -113,7 +114,7 @@ public class GodotIO {
 			ad.len=ad.is.available();
 		} catch (Exception e) {
 
-			System.out.printf("Exception availabling on file_open: %s\n",e);
+			System.out.printf("Exception availabling on file_open: %s\n",path);
 			return -1;
 		}
 
diff --git a/platform/android/java/src/com/android/godot/GodotLib.java b/platform/android/java/src/com/android/godot/GodotLib.java
index 71c31e9f836..f099e0feffd 100644
--- a/platform/android/java/src/com/android/godot/GodotLib.java
+++ b/platform/android/java/src/com/android/godot/GodotLib.java
@@ -44,7 +44,7 @@ public class GodotLib {
      * @param height the current view height
      */
 
-     public static native void initialize(Godot p_instance,boolean need_reload_hook,String[] p_cmdline);
+     public static native void initialize(Godot p_instance,boolean need_reload_hook,String[] p_cmdline,Object p_asset_manager);
      public static native void resize(int width, int height,boolean reload);
      public static native void newcontext();
      public static native void quit();
diff --git a/platform/android/java_glue.cpp b/platform/android/java_glue.cpp
index 31582547811..d001cface2e 100644
--- a/platform/android/java_glue.cpp
+++ b/platform/android/java_glue.cpp
@@ -33,13 +33,14 @@
 #include "main/main.h"
 #include <unistd.h>
 #include "file_access_jandroid.h"
+#include "file_access_android.h"
 #include "dir_access_jandroid.h"
 #include "audio_driver_jandroid.h"
 #include "globals.h"
 #include "thread_jandroid.h"
 #include "core/os/keyboard.h"
 #include "java_class_wrapper.h"
-
+#include "android/asset_manager_jni.h"
 
 static JavaClassWrapper *java_class_wrapper=NULL;
 static OS_Android *os_android=NULL;
@@ -764,7 +765,7 @@ static void _stop_video() {
 	env->CallVoidMethod(godot_io, _stopVideo);
 }
 
-JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_initialize(JNIEnv * env, jobject obj, jobject activity,jboolean p_need_reload_hook, jobjectArray p_cmdline) {
+JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_initialize(JNIEnv * env, jobject obj, jobject activity,jboolean p_need_reload_hook, jobjectArray p_cmdline,jobject p_asset_manager) {
 
 	__android_log_print(ANDROID_LOG_INFO,"godot","**INIT EVENT! - %p\n",env);
 
@@ -820,7 +821,14 @@ JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_initialize(JNIEnv * env,
 		}
 
 		ThreadAndroid::make_default(jvm);
+#ifdef USE_JAVA_FILE_ACCESS
 		FileAccessJAndroid::setup(gob);
+#else
+
+		jobject amgr = env->NewGlobalRef(p_asset_manager);
+
+		FileAccessAndroid::asset_manager=AAssetManager_fromJava(env,amgr);
+#endif
 		DirAccessJAndroid::setup(gob);
 		AudioDriverAndroid::setup(gob);
 	}
diff --git a/platform/android/java_glue.h b/platform/android/java_glue.h
index 57a4cc8651f..9410fe71324 100644
--- a/platform/android/java_glue.h
+++ b/platform/android/java_glue.h
@@ -36,7 +36,7 @@
 
 
 extern "C" {
-    JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_initialize(JNIEnv * env, jobject obj, jobject activity,jboolean p_need_reload_hook, jobjectArray p_cmdline);
+    JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_initialize(JNIEnv * env, jobject obj, jobject activity,jboolean p_need_reload_hook, jobjectArray p_cmdline,jobject p_asset_manager);
     JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_resize(JNIEnv * env, jobject obj,  jint width, jint height, jboolean reload);
     JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_newcontext(JNIEnv * env, jobject obj);
     JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_step(JNIEnv * env, jobject obj);
diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp
index 612148418b1..e2ff128f0d9 100644
--- a/platform/android/os_android.cpp
+++ b/platform/android/os_android.cpp
@@ -37,6 +37,8 @@
 #include "servers/visual/visual_server_wrap_mt.h"
 #include "main/main.h"
 
+#include "file_access_android.h"
+
 #include "core/globals.h"
 
 #ifdef ANDROID_NATIVE_ACTIVITY
@@ -89,8 +91,14 @@ void OS_Android::initialize_core() {
 
 	if (use_apk_expansion)
 		FileAccess::make_default<FileAccessUnix>(FileAccess::ACCESS_RESOURCES);
-	else
+	else {
+#ifdef USE_JAVA_FILE_ACCESS
 		FileAccess::make_default<FileAccessBufferedFA<FileAccessJAndroid> >(FileAccess::ACCESS_RESOURCES);
+#else
+		//FileAccess::make_default<FileAccessBufferedFA<FileAccessAndroid> >(FileAccess::ACCESS_RESOURCES);
+		FileAccess::make_default<FileAccessAndroid>(FileAccess::ACCESS_RESOURCES);
+#endif
+	}
 	FileAccess::make_default<FileAccessUnix>(FileAccess::ACCESS_USERDATA);
 	FileAccess::make_default<FileAccessUnix>(FileAccess::ACCESS_FILESYSTEM);
 	//FileAccessBufferedFA<FileAccessUnix>::make_default();
diff --git a/platform/android/os_android.h b/platform/android/os_android.h
index 7a5a55653f1..e9b0d001965 100644
--- a/platform/android/os_android.h
+++ b/platform/android/os_android.h
@@ -41,6 +41,9 @@
 #include "servers/visual/rasterizer.h"
 
 
+//#ifdef USE_JAVA_FILE_ACCESS
+
+
 #ifdef ANDROID_NATIVE_ACTIVITY
 
 #include <android/sensor.h>
diff --git a/platform/iphone/app_delegate.mm b/platform/iphone/app_delegate.mm
index 3c79137171f..d5764b2b5cd 100644
--- a/platform/iphone/app_delegate.mm
+++ b/platform/iphone/app_delegate.mm
@@ -43,6 +43,11 @@
 #import <AdSupport/AdSupport.h>
 #endif
 
+#ifdef MODULE_PARSE_ENABLED
+#import <Parse/Parse.h>
+#import "FBSDKCoreKit/FBSDKCoreKit.h"
+#endif
+
 #define kFilteringFactor                        0.1
 #define kRenderingFrequency						60
 #define kAccelerometerFrequency         100.0 // Hz
@@ -139,8 +144,9 @@ static int frame_count = 0;
 		++frame_count;
 
 		// this might be necessary before here
-		for (NSString* key in [[NSBundle mainBundle] infoDictionary]) {
-			NSObject* value = [[[NSBundle mainBundle] infoDictionary] objectForKey:key];
+		NSDictionary* dict = [[NSBundle mainBundle] infoDictionary];
+		for (NSString* key in dict) {
+			NSObject* value = [dict objectForKey:key];
 			String ukey = String::utf8([key UTF8String]);
 
 			// we need a NSObject to Variant conversor
@@ -341,6 +347,15 @@ static int frame_count = 0;
 
 // For 4.2+ support
 - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation {
+#ifdef MODULE_PARSE_ENABLED
+	NSLog(@"Handling application openURL");
+	return [[FBSDKApplicationDelegate sharedInstance] application:application
+														  openURL:url
+												sourceApplication:sourceApplication
+													   annotation:annotation];
+#endif
+
+
 #ifdef MODULE_FACEBOOKSCORER_IOS_ENABLED
 	return [[[FacebookScorer sharedInstance] facebook] handleOpenURL:url];
 #else
@@ -348,6 +363,32 @@ static int frame_count = 0;
 #endif
 }
 
+- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
+#ifdef MODULE_PARSE_ENABLED
+	// Store the deviceToken in the current installation and save it to Parse.
+	PFInstallation *currentInstallation = [PFInstallation currentInstallation];
+	//NSString* token = [[NSString alloc] initWithData:deviceToken encoding:NSUTF8StringEncoding];
+	NSLog(@"Device Token : %@ ", deviceToken);
+	[currentInstallation setDeviceTokenFromData:deviceToken];
+	[currentInstallation saveInBackground];
+#endif
+}
+
+- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo {
+#ifdef MODULE_PARSE_ENABLED
+	[PFPush handlePush:userInfo];
+	NSDictionary *aps = [userInfo objectForKey:UIApplicationLaunchOptionsRemoteNotificationKey];
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+	
+	NSLog(@"Push Notification Payload (app active) %@", aps);
+	[defaults setObject:aps forKey:@"notificationInfo"];
+	[defaults synchronize];
+	if (application.applicationState == UIApplicationStateInactive) {
+		[PFAnalytics trackAppOpenedWithRemoteNotificationPayload:userInfo];
+	}
+#endif
+}
+
 - (void)dealloc
 {
 	[window release];
diff --git a/platform/iphone/detect.py b/platform/iphone/detect.py
index fb57876a838..6be3539b9d0 100644
--- a/platform/iphone/detect.py
+++ b/platform/iphone/detect.py
@@ -59,7 +59,7 @@ def configure(env):
 		env.Append(CPPFLAGS=['-DNEED_LONG_INT'])
 		env.Append(CPPFLAGS=['-DLIBYUV_DISABLE_NEON'])
 	else:
-		env['CCFLAGS'] = string.split('-fno-objc-arc -arch armv7 -fmessage-length=0 -fno-strict-aliasing -fdiagnostics-print-source-range-info -fdiagnostics-show-category=id -fdiagnostics-parseable-fixits -Wno-trigraphs -fpascal-strings -Wmissing-prototypes -Wreturn-type -Wparentheses -Wswitch -Wno-unused-parameter -Wunused-variable -Wunused-value -Wno-shorten-64-to-32 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.0.sdk -gdwarf-2 -fvisibility=hidden -Wno-sign-conversion -mthumb "-DIBOutlet=__attribute__((iboutlet))" "-DIBOutletCollection(ClassName)=__attribute__((iboutletcollection(ClassName)))" "-DIBAction=void)__attribute__((ibaction)" -miphoneos-version-min=4.3 -MMD -MT dependencies -isysroot $IPHONESDK')
+		env['CCFLAGS'] = string.split('-fno-objc-arc -arch armv7 -fmessage-length=0 -fno-strict-aliasing -fdiagnostics-print-source-range-info -fdiagnostics-show-category=id -fdiagnostics-parseable-fixits -Wno-trigraphs -fpascal-strings -Wmissing-prototypes -Wreturn-type -Wparentheses -Wswitch -Wno-unused-parameter -Wunused-variable -Wunused-value -Wno-shorten-64-to-32 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.0.sdk -gdwarf-2 -fvisibility=hidden -Wno-sign-conversion -mthumb "-DIBOutlet=__attribute__((iboutlet))" "-DIBOutletCollection(ClassName)=__attribute__((iboutletcollection(ClassName)))" "-DIBAction=void)__attribute__((ibaction)" -miphoneos-version-min=5.1.1 -MMD -MT dependencies -isysroot $IPHONESDK')
 
 	if (env["bits"]=="64"):
 		env.Append(LINKFLAGS=['-arch', 'arm64', '-Wl,-dead_strip', '-miphoneos-version-min=5.1.1',
@@ -80,7 +80,7 @@ def configure(env):
 							'-framework', 'CoreMedia',
 							])
 	else:
-		env.Append(LINKFLAGS=['-arch', 'armv7', '-Wl,-dead_strip', '-miphoneos-version-min=4.3',
+		env.Append(LINKFLAGS=['-arch', 'armv7', '-Wl,-dead_strip', '-miphoneos-version-min=5.1.1',
 							'-isysroot', '$IPHONESDK',
 							'-framework', 'Foundation',
 							'-framework', 'UIKit',
diff --git a/platform/iphone/gl_view.h b/platform/iphone/gl_view.h
index c58c8635107..cda75394dbb 100755
--- a/platform/iphone/gl_view.h
+++ b/platform/iphone/gl_view.h
@@ -34,7 +34,7 @@
 #import <MediaPlayer/MediaPlayer.h>
 #import <AVFoundation/AVFoundation.h>
 
-#define USE_CADISPLAYLINK      1   //iOS version 3.1+ is required
+#define USE_CADISPLAYLINK      0   //iOS version 3.1+ is required
 
 @protocol GLViewDelegate;
 
diff --git a/platform/iphone/in_app_store.mm b/platform/iphone/in_app_store.mm
index e3ba6bbd73c..f689123c812 100644
--- a/platform/iphone/in_app_store.mm
+++ b/platform/iphone/in_app_store.mm
@@ -28,6 +28,10 @@
 /*************************************************************************/
 #ifdef STOREKIT_ENABLED
 
+#ifdef MODULE_FUSEBOXX_ENABLED
+#import "modules/fuseboxx/ios/FuseSDK.h"
+#endif
+
 #include "in_app_store.h"
 
 extern "C" {
@@ -222,6 +226,11 @@ Error InAppStore::request_product_info(Variant p_params) {
             else{
                 [pending_transactions setObject:transaction forKey:transaction.payment.productIdentifier];
             }
+			
+			#ifdef MODULE_FUSEBOXX_ENABLED
+			printf("Registering transaction on Fuseboxx!\n");
+			[FuseSDK registerInAppPurchase: transaction];
+			#endif
 		} break;
 		case SKPaymentTransactionStateFailed: {
             printf("status transaction failed!\n");
diff --git a/platform/osx/detect.py b/platform/osx/detect.py
index 5703cbc5465..22cee0527e6 100644
--- a/platform/osx/detect.py
+++ b/platform/osx/detect.py
@@ -11,15 +11,17 @@ def get_name():
 
 def can_build():
 
-	if (sys.platform != "darwin"):
-		return False
+	if (sys.platform == "darwin" or os.environ.has_key("OSXCROSS_ROOT")):
+		return True
 
-	return True # osx enabled
+
+	return False
 
 def get_opts():
 
 	return [
 	    ('force_64_bits','Force 64 bits binary','no'),
+	    ('osxcross_sdk','OSXCross SDK version','darwin14'),
 
 	 ]
 
@@ -59,12 +61,31 @@ def configure(env):
 		env.Append(CPPPATH=['#tools/freetype'])
 		env.Append(CPPPATH=['#tools/freetype/freetype/include'])
 
-	if (env["bits"]=="64"):
-		env.Append(CCFLAGS=['-arch', 'x86_64'])
-		env.Append(LINKFLAGS=['-arch', 'x86_64'])
+
+
+	if (not os.environ.has_key("OSXCROSS_ROOT")):
+		#regular native build
+		if (env["bits"]=="64"):
+		    env.Append(CCFLAGS=['-arch', 'x86_64'])
+		    env.Append(LINKFLAGS=['-arch', 'x86_64'])
+		else:
+		    env.Append(CCFLAGS=['-arch', 'i386'])
+		    env.Append(LINKFLAGS=['-arch', 'i386'])
 	else:
-		env.Append(CCFLAGS=['-arch', 'i386'])
-		env.Append(LINKFLAGS=['-arch', 'i386'])
+		#osxcross build
+		root=os.environ.get("OSXCROSS_ROOT",0)
+		if env["bits"]=="64":
+			basecmd=root+"/target/bin/x86_64-apple-"+env["osxcross_sdk"]+"-"
+		else:
+			basecmd=root+"/target/bin/i386-apple-"+env["osxcross_sdk"]+"-"
+
+
+		env['CC'] = basecmd+"cc"
+		env['CXX'] = basecmd+"c++"
+		env['AR'] = basecmd+"ar"
+		env['RANLIB'] = basecmd+"ranlib"
+		env['AS'] = basecmd+"as"
+
 
 #	env.Append(CPPPATH=['#platform/osx/include/freetype2', '#platform/osx/include'])
 #	env.Append(LIBPATH=['#platform/osx/lib'])
diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h
index 144037b1cbe..869997f190d 100644
--- a/platform/osx/os_osx.h
+++ b/platform/osx/os_osx.h
@@ -170,7 +170,7 @@ public:
 	virtual int get_screen_count() const;
 	virtual int get_current_screen() const;
 	virtual void set_current_screen(int p_screen);
-	virtual Point2 get_screen_position(int p_screen=0);
+	virtual Point2 get_screen_position(int p_screen=0) const;
 	virtual Point2 get_window_position() const;
 	virtual void set_window_position(const Point2& p_position);
 	virtual void set_window_size(const Size2 p_size);
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm
index 72699366c4d..abfe42beda8 100644
--- a/platform/osx/os_osx.mm
+++ b/platform/osx/os_osx.mm
@@ -1279,7 +1279,7 @@ void OS_OSX::set_current_screen(int p_screen) {
 	current_screen = p_screen;
 };
 
-Point2 OS_OSX::get_screen_position(int p_screen) {
+Point2 OS_OSX::get_screen_position(int p_screen) const {
 
 	ERR_FAIL_INDEX_V(p_screen, screens.size(), Point2());
 	return screens[p_screen].pos;
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index ff85e286db3..b8890a3a2f8 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -126,7 +126,9 @@ def configure(env):
 	env.ParseConfig('pkg-config x11 --cflags --libs')
 	env.ParseConfig('pkg-config xinerama --cflags --libs')
 	env.ParseConfig('pkg-config xcursor --cflags --libs')
-	env.ParseConfig('pkg-config openssl --cflags --libs')
+
+	if (env["openssl"]=="yes"):
+		env.ParseConfig('pkg-config openssl --cflags --libs')
 
 
 	env.ParseConfig('pkg-config freetype2 --cflags --libs')
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp
index b34d1ba7c8c..51f4392eb4f 100644
--- a/platform/x11/os_x11.cpp
+++ b/platform/x11/os_x11.cpp
@@ -441,6 +441,7 @@ void OS_X11::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
 	net_wm_icon = XInternAtom(x11_display, "_NET_WM_ICON", False);
 
 
+
 	//printf("got map notify\n");
 		
 }
@@ -504,6 +505,23 @@ void OS_X11::set_mouse_mode(MouseMode p_mode) {
 	mouse_mode=p_mode;
 
 	if (mouse_mode==MOUSE_MODE_CAPTURED) {
+
+		while(true) {
+			//flush pending motion events
+
+			if (XPending(x11_display) > 0) {
+				XEvent event;
+				XPeekEvent(x11_display, &event);
+				if (event.type==MotionNotify) {
+					XNextEvent(x11_display,&event);
+				} else {
+					break;
+				}
+			} else {
+				break;
+			}
+		}
+
 		if (XGrabPointer(x11_display, x11_window, True,
 				    ButtonPressMask | ButtonReleaseMask |
 				    PointerMotionMask, GrabModeAsync, GrabModeAsync,
@@ -518,6 +536,8 @@ void OS_X11::set_mouse_mode(MouseMode p_mode) {
 			      0,0,0,0, (int)center.x, (int)center.y);
 
 		input->set_mouse_pos(center);
+	} else {
+		do_mouse_warp=false;
 	}
 }
 
@@ -652,17 +672,24 @@ void OS_X11::set_current_screen(int p_screen) {
 }
 
 Point2 OS_X11::get_screen_position(int p_screen) const {
+
 	// Using Xinerama Extension
 	int event_base, error_base;
 	const Bool ext_okay = XineramaQueryExtension(x11_display, &event_base, &error_base);
-	if( !ext_okay ) return Point2i(0,0);
+	if( !ext_okay ) {
+		return Point2i(0,0);
+	}
 	
 	int count;
 	XineramaScreenInfo* xsi = XineramaQueryScreens(x11_display, &count);
-	if( p_screen >= count ) return Point2i(0,0);
+	if( p_screen >= count ) {
+		return Point2i(0,0);
+	}
 	
 	Point2i position = Point2i(xsi[p_screen].x_org, xsi[p_screen].y_org);
+
 	XFree(xsi);
+
 	return position;
 }
 
@@ -696,6 +723,7 @@ Point2 OS_X11::get_window_position() const {
 void OS_X11::set_window_position(const Point2& p_position) {
 	// Using EWMH -- Extended Window Manager Hints
 	// to get the size of the decoration 
+#if 0
 	Atom property = XInternAtom(x11_display,"_NET_FRAME_EXTENTS", True);
 	Atom type;
 	int format;
@@ -738,6 +766,9 @@ void OS_X11::set_window_position(const Point2& p_position) {
 	top -= screen_position.y;
 
 	XMoveWindow(x11_display,x11_window,p_position.x - left,p_position.y - top);
+#else
+	XMoveWindow(x11_display,x11_window,p_position.x,p_position.y);
+#endif
 }
 
 Size2 OS_X11::get_window_size() const {
@@ -1131,7 +1162,7 @@ void OS_X11::process_xevents() {
 
 	//printf("checking events %i\n", XPending(x11_display));
 
-	bool do_mouse_warp=false;
+	do_mouse_warp=false;
 
 	while (XPending(x11_display) > 0) {
 		XEvent event;
@@ -1244,8 +1275,38 @@ void OS_X11::process_xevents() {
 			
 		} break;	
 		case MotionNotify: {
-						
+
+			// FUCK YOU X11 API YOU SERIOUSLY GROSS ME OUT
+			// YOU ARE AS GROSS AS LOOKING AT A PUTRID PILE
+			// OF POOP STICKING OUT OF A CLOGGED TOILET
+			// HOW THE FUCK I AM SUPPOSED TO KNOW WHICH ONE
+			// OF THE MOTION NOTIFY EVENTS IS THE ONE GENERATED
+			// BY WARPING THE MOUSE POINTER?
+			// YOU ARE FORCING ME TO FILTER ONE BY ONE TO FIND IT
+			// PLEASE DO ME A FAVOR AND DIE DROWNED IN A FECAL
+			// MOUNTAIN BECAUSE THAT'S WHERE YOU BELONG.
+
 			
+			while(true) {
+				if (mouse_mode==MOUSE_MODE_CAPTURED && event.xmotion.x==current_videomode.width/2 && event.xmotion.y==current_videomode.height/2) {
+					//this is likely the warp event since it was warped here
+					center=Vector2(event.xmotion.x,event.xmotion.y);
+					break;
+				}
+
+				if (XPending(x11_display) > 0) {
+					XEvent tevent;
+					XPeekEvent(x11_display, &tevent);
+					if (tevent.type==MotionNotify) {
+						XNextEvent(x11_display,&event);
+					} else {
+						break;
+					}
+				} else {
+					break;
+				}
+			}
+
 			last_timestamp=event.xmotion.time;
 		
 			// Motion is also simple.
diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h
index 261a54dd254..12f0aec611a 100644
--- a/platform/x11/os_x11.h
+++ b/platform/x11/os_x11.h
@@ -114,6 +114,7 @@ class OS_X11 : public OS_Unix {
 	bool minimized;
 	int dpad_last[2];
 
+	bool do_mouse_warp;
 
 	const char *cursor_theme;
 	int cursor_size;
diff --git a/scene/2d/sprite.cpp b/scene/2d/sprite.cpp
index c521952f9b1..6705cebf379 100644
--- a/scene/2d/sprite.cpp
+++ b/scene/2d/sprite.cpp
@@ -322,8 +322,8 @@ void Sprite::_bind_methods() {
 	ADD_PROPERTYNZ( PropertyInfo( Variant::VECTOR2, "offset"), _SCS("set_offset"),_SCS("get_offset"));
 	ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "flip_h"), _SCS("set_flip_h"),_SCS("is_flipped_h"));
 	ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "flip_v"), _SCS("set_flip_v"),_SCS("is_flipped_v"));
-	ADD_PROPERTYNO( PropertyInfo( Variant::INT, "vframes"), _SCS("set_vframes"),_SCS("get_vframes"));
-	ADD_PROPERTYNO( PropertyInfo( Variant::INT, "hframes"), _SCS("set_hframes"),_SCS("get_hframes"));
+	ADD_PROPERTYNO( PropertyInfo( Variant::INT, "vframes",PROPERTY_HINT_RANGE,"1,16384,1"), _SCS("set_vframes"),_SCS("get_vframes"));
+	ADD_PROPERTYNO( PropertyInfo( Variant::INT, "hframes",PROPERTY_HINT_RANGE,"1,16384,1"), _SCS("set_hframes"),_SCS("get_hframes"));
 	ADD_PROPERTYNZ( PropertyInfo( Variant::INT, "frame",PROPERTY_HINT_SPRITE_FRAME), _SCS("set_frame"),_SCS("get_frame"));
 	ADD_PROPERTYNO( PropertyInfo( Variant::COLOR, "modulate"), _SCS("set_modulate"),_SCS("get_modulate"));
 	ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "region"), _SCS("set_region"),_SCS("is_region"));
diff --git a/scene/3d/area.cpp b/scene/3d/area.cpp
index 58cbbdba22a..ff35837bc0c 100644
--- a/scene/3d/area.cpp
+++ b/scene/3d/area.cpp
@@ -83,15 +83,25 @@ real_t Area::get_gravity() const{
 
 	return gravity;
 }
+void Area::set_linear_damp(real_t p_linear_damp){
 
-void Area::set_density(real_t p_density){
-
-	density=p_density;
-	PhysicsServer::get_singleton()->area_set_param(get_rid(),PhysicsServer::AREA_PARAM_DENSITY,p_density);
+	linear_damp=p_linear_damp;
+	PhysicsServer::get_singleton()->area_set_param(get_rid(),PhysicsServer::AREA_PARAM_LINEAR_DAMP,p_linear_damp);
 }
-real_t Area::get_density() const{
+real_t Area::get_linear_damp() const{
 
-	return density;
+	return linear_damp;
+}
+
+void Area::set_angular_damp(real_t p_angular_damp){
+
+	angular_damp=p_angular_damp;
+	PhysicsServer::get_singleton()->area_set_param(get_rid(),PhysicsServer::AREA_PARAM_ANGULAR_DAMP,p_angular_damp);
+}
+
+real_t Area::get_angular_damp() const{
+
+	return angular_damp;
 }
 
 void Area::set_priority(real_t p_priority){
@@ -533,8 +543,11 @@ void Area::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("set_gravity","gravity"),&Area::set_gravity);
 	ObjectTypeDB::bind_method(_MD("get_gravity"),&Area::get_gravity);
 
-	ObjectTypeDB::bind_method(_MD("set_density","density"),&Area::set_density);
-	ObjectTypeDB::bind_method(_MD("get_density"),&Area::get_density);
+	ObjectTypeDB::bind_method(_MD("set_angular_damp","angular_damp"),&Area::set_angular_damp);
+	ObjectTypeDB::bind_method(_MD("get_angular_damp"),&Area::get_angular_damp);
+
+	ObjectTypeDB::bind_method(_MD("set_linear_damp","linear_damp"),&Area::set_linear_damp);
+	ObjectTypeDB::bind_method(_MD("get_linear_damp"),&Area::get_linear_damp);
 
 	ObjectTypeDB::bind_method(_MD("set_priority","priority"),&Area::set_priority);
 	ObjectTypeDB::bind_method(_MD("get_priority"),&Area::get_priority);
@@ -571,7 +584,8 @@ void Area::_bind_methods() {
 	ADD_PROPERTY( PropertyInfo(Variant::REAL,"gravity_distance_scale", PROPERTY_HINT_RANGE,"0,1024,0.001"),_SCS("set_gravity_distance_scale"),_SCS("get_gravity_distance_scale"));
 	ADD_PROPERTY( PropertyInfo(Variant::VECTOR3,"gravity_vec"),_SCS("set_gravity_vector"),_SCS("get_gravity_vector"));
 	ADD_PROPERTY( PropertyInfo(Variant::REAL,"gravity",PROPERTY_HINT_RANGE,"-1024,1024,0.01"),_SCS("set_gravity"),_SCS("get_gravity"));
-	ADD_PROPERTY( PropertyInfo(Variant::REAL,"density",PROPERTY_HINT_RANGE,"0,1024,0.001"),_SCS("set_density"),_SCS("get_density"));
+	ADD_PROPERTY( PropertyInfo(Variant::REAL,"linear_damp",PROPERTY_HINT_RANGE,"0,1024,0.001"),_SCS("set_linear_damp"),_SCS("get_linear_damp"));
+	ADD_PROPERTY( PropertyInfo(Variant::REAL,"angular_damp",PROPERTY_HINT_RANGE,"0,1024,0.001"),_SCS("set_angular_damp"),_SCS("get_angular_damp"));
 	ADD_PROPERTY( PropertyInfo(Variant::INT,"priority",PROPERTY_HINT_RANGE,"0,128,1"),_SCS("set_priority"),_SCS("get_priority"));
 	ADD_PROPERTY( PropertyInfo(Variant::BOOL,"monitoring"),_SCS("set_enable_monitoring"),_SCS("is_monitoring_enabled"));
 	ADD_PROPERTY( PropertyInfo(Variant::BOOL,"monitorable"),_SCS("set_monitorable"),_SCS("is_monitorable"));
@@ -586,7 +600,8 @@ Area::Area() : CollisionObject(PhysicsServer::get_singleton()->area_create(),tru
 	set_gravity_vector(Vector3(0,-1,0));
 	gravity_is_point=false;
 	gravity_distance_scale=0;
-	density=0.1;
+	linear_damp=0.1;
+	angular_damp=1;
 	priority=0;
 	monitoring=false;
 	set_ray_pickable(false);
diff --git a/scene/3d/area.h b/scene/3d/area.h
index fa7500c47c8..f03955d1e76 100644
--- a/scene/3d/area.h
+++ b/scene/3d/area.h
@@ -50,7 +50,8 @@ private:
 	real_t gravity;
 	bool gravity_is_point;
 	real_t gravity_distance_scale;
-	real_t density;
+	real_t angular_damp;
+	real_t linear_damp;
 	int priority;
 	bool monitoring;
 	bool monitorable;
@@ -139,8 +140,11 @@ public:
 	void set_gravity(real_t p_gravity);
 	real_t get_gravity() const;
 
-	void set_density(real_t p_density);
-	real_t get_density() const;
+	void set_angular_damp(real_t p_angular_damp);
+	real_t get_angular_damp() const;
+
+	void set_linear_damp(real_t p_linear_damp);
+	real_t get_linear_damp() const;
 
 	void set_priority(real_t p_priority);
 	real_t get_priority() const;
diff --git a/scene/3d/physics_body.cpp b/scene/3d/physics_body.cpp
index 3d5091f6671..d61859a3d06 100644
--- a/scene/3d/physics_body.cpp
+++ b/scene/3d/physics_body.cpp
@@ -133,6 +133,8 @@ real_t StaticBody::get_bounce() const{
 	return bounce;
 }
 
+
+
 void StaticBody::set_constant_linear_velocity(const Vector3& p_vel) {
 
 	constant_linear_velocity=p_vel;
@@ -494,6 +496,42 @@ real_t RigidBody::get_bounce() const{
 	return bounce;
 }
 
+
+void RigidBody::set_gravity_scale(real_t p_gravity_scale){
+
+	gravity_scale=p_gravity_scale;
+	PhysicsServer::get_singleton()->body_set_param(get_rid(),PhysicsServer::BODY_PARAM_GRAVITY_SCALE,gravity_scale);
+
+}
+real_t RigidBody::get_gravity_scale() const{
+
+	return gravity_scale;
+}
+
+void RigidBody::set_linear_damp(real_t p_linear_damp){
+
+	ERR_FAIL_COND(p_linear_damp<-1);
+	linear_damp=p_linear_damp;
+	PhysicsServer::get_singleton()->body_set_param(get_rid(),PhysicsServer::BODY_PARAM_LINEAR_DAMP,linear_damp);
+
+}
+real_t RigidBody::get_linear_damp() const{
+
+	return linear_damp;
+}
+
+void RigidBody::set_angular_damp(real_t p_angular_damp){
+
+	ERR_FAIL_COND(p_angular_damp<-1);
+	angular_damp=p_angular_damp;
+	PhysicsServer::get_singleton()->body_set_param(get_rid(),PhysicsServer::BODY_PARAM_ANGULAR_DAMP,angular_damp);
+
+}
+real_t RigidBody::get_angular_damp() const{
+
+	return angular_damp;
+}
+
 void RigidBody::set_axis_velocity(const Vector3& p_axis) {
 
 	Vector3 v = state? state->get_linear_velocity() : linear_velocity;
@@ -685,6 +723,16 @@ void RigidBody::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("set_angular_velocity","angular_velocity"),&RigidBody::set_angular_velocity);
 	ObjectTypeDB::bind_method(_MD("get_angular_velocity"),&RigidBody::get_angular_velocity);
 
+	ObjectTypeDB::bind_method(_MD("set_gravity_scale","gravity_scale"),&RigidBody::set_gravity_scale);
+	ObjectTypeDB::bind_method(_MD("get_gravity_scale"),&RigidBody::get_gravity_scale);
+
+	ObjectTypeDB::bind_method(_MD("set_linear_damp","linear_damp"),&RigidBody::set_linear_damp);
+	ObjectTypeDB::bind_method(_MD("get_linear_damp"),&RigidBody::get_linear_damp);
+
+	ObjectTypeDB::bind_method(_MD("set_angular_damp","angular_damp"),&RigidBody::set_angular_damp);
+	ObjectTypeDB::bind_method(_MD("get_angular_damp"),&RigidBody::get_angular_damp);
+
+
 	ObjectTypeDB::bind_method(_MD("set_max_contacts_reported","amount"),&RigidBody::set_max_contacts_reported);
 	ObjectTypeDB::bind_method(_MD("get_max_contacts_reported"),&RigidBody::get_max_contacts_reported);
 
@@ -722,6 +770,7 @@ void RigidBody::_bind_methods() {
 	ADD_PROPERTY( PropertyInfo(Variant::REAL,"weight",PROPERTY_HINT_EXP_RANGE,"0.01,65535,0.01",PROPERTY_USAGE_EDITOR),_SCS("set_weight"),_SCS("get_weight"));
 	ADD_PROPERTY( PropertyInfo(Variant::REAL,"friction",PROPERTY_HINT_RANGE,"0,1,0.01"),_SCS("set_friction"),_SCS("get_friction"));
 	ADD_PROPERTY( PropertyInfo(Variant::REAL,"bounce",PROPERTY_HINT_RANGE,"0,1,0.01"),_SCS("set_bounce"),_SCS("get_bounce"));
+	ADD_PROPERTY( PropertyInfo(Variant::REAL,"gravity_scale",PROPERTY_HINT_RANGE,"-128,128,0.01"),_SCS("set_gravity_scale"),_SCS("get_gravity_scale"));
 	ADD_PROPERTY( PropertyInfo(Variant::BOOL,"custom_integrator"),_SCS("set_use_custom_integrator"),_SCS("is_using_custom_integrator"));
 	ADD_PROPERTY( PropertyInfo(Variant::BOOL,"continuous_cd"),_SCS("set_use_continuous_collision_detection"),_SCS("is_using_continuous_collision_detection"));
 	ADD_PROPERTY( PropertyInfo(Variant::INT,"contacts_reported"),_SCS("set_max_contacts_reported"),_SCS("get_max_contacts_reported"));
@@ -731,6 +780,8 @@ void RigidBody::_bind_methods() {
 	ADD_PROPERTY( PropertyInfo(Variant::INT,"axis_lock",PROPERTY_HINT_ENUM,"Disabled,Lock X,Lock Y,Lock Z"),_SCS("set_axis_lock"),_SCS("get_axis_lock"));
 	ADD_PROPERTY( PropertyInfo(Variant::VECTOR3,"velocity/linear"),_SCS("set_linear_velocity"),_SCS("get_linear_velocity"));
 	ADD_PROPERTY( PropertyInfo(Variant::VECTOR3,"velocity/angular"),_SCS("set_angular_velocity"),_SCS("get_angular_velocity"));
+	ADD_PROPERTY( PropertyInfo(Variant::REAL,"damp_override/linear",PROPERTY_HINT_RANGE,"-1,128,0.01"),_SCS("set_linear_damp"),_SCS("get_linear_damp"));
+	ADD_PROPERTY( PropertyInfo(Variant::REAL,"damp_override/angular",PROPERTY_HINT_RANGE,"-1,128,0.01"),_SCS("set_angular_damp"),_SCS("get_angular_damp"));
 
 	ADD_SIGNAL( MethodInfo("body_enter_shape",PropertyInfo(Variant::INT,"body_id"),PropertyInfo(Variant::OBJECT,"body"),PropertyInfo(Variant::INT,"body_shape"),PropertyInfo(Variant::INT,"local_shape")));
 	ADD_SIGNAL( MethodInfo("body_exit_shape",PropertyInfo(Variant::INT,"body_id"),PropertyInfo(Variant::OBJECT,"body"),PropertyInfo(Variant::INT,"body_shape"),PropertyInfo(Variant::INT,"local_shape")));
@@ -753,6 +804,10 @@ RigidBody::RigidBody() : PhysicsBody(PhysicsServer::BODY_MODE_RIGID) {
 	max_contacts_reported=0;
 	state=NULL;
 
+	gravity_scale=1;
+	linear_damp=-1;
+	angular_damp=-1;
+
 	//angular_velocity=0;
 	sleeping=false;
 	ccd=false;
diff --git a/scene/3d/physics_body.h b/scene/3d/physics_body.h
index 0ff3b360af1..66490ba9258 100644
--- a/scene/3d/physics_body.h
+++ b/scene/3d/physics_body.h
@@ -129,6 +129,10 @@ private:
 
 	Vector3 linear_velocity;
 	Vector3  angular_velocity;
+	real_t gravity_scale;
+	real_t linear_damp;
+	real_t angular_damp;
+
 	bool sleeping;
 	bool ccd;
 
@@ -217,6 +221,16 @@ public:
 	void set_angular_velocity(const Vector3&p_velocity);
 	Vector3  get_angular_velocity() const;
 
+	void set_gravity_scale(real_t p_gravity_scale);
+	real_t get_gravity_scale() const;
+
+	void set_linear_damp(real_t p_linear_damp);
+	real_t get_linear_damp() const;
+
+	void set_angular_damp(real_t p_angular_damp);
+	real_t get_angular_damp() const;
+
+
 	void set_use_custom_integrator(bool p_enable);
 	bool is_using_custom_integrator();
 
diff --git a/scene/3d/sprite_3d.cpp b/scene/3d/sprite_3d.cpp
index e9da95f3fb6..c7d1249a07c 100644
--- a/scene/3d/sprite_3d.cpp
+++ b/scene/3d/sprite_3d.cpp
@@ -578,8 +578,8 @@ void Sprite3D::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("get_hframes"),&Sprite3D::get_hframes);
 
 	ADD_PROPERTY( PropertyInfo( Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE,"Texture"), _SCS("set_texture"),_SCS("get_texture"));
-	ADD_PROPERTY( PropertyInfo( Variant::INT, "vframes"), _SCS("set_vframes"),_SCS("get_vframes"));
-	ADD_PROPERTY( PropertyInfo( Variant::INT, "hframes"), _SCS("set_hframes"),_SCS("get_hframes"));
+	ADD_PROPERTY( PropertyInfo( Variant::INT, "vframes",PROPERTY_HINT_RANGE,"1,16384,1"), _SCS("set_vframes"),_SCS("get_vframes"));
+	ADD_PROPERTY( PropertyInfo( Variant::INT, "hframes",PROPERTY_HINT_RANGE,"1,16384,1"), _SCS("set_hframes"),_SCS("get_hframes"));
 	ADD_PROPERTY( PropertyInfo( Variant::INT, "frame",PROPERTY_HINT_SPRITE_FRAME), _SCS("set_frame"),_SCS("get_frame"));
 	ADD_PROPERTY( PropertyInfo( Variant::BOOL, "region"), _SCS("set_region"),_SCS("is_region"));
 	ADD_PROPERTY( PropertyInfo( Variant::RECT2, "region_rect"), _SCS("set_region_rect"),_SCS("get_region_rect"));
diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp
index 3ddf23fc4a7..0c0f924f522 100644
--- a/scene/gui/dialogs.cpp
+++ b/scene/gui/dialogs.cpp
@@ -274,7 +274,7 @@ Button* AcceptDialog::add_button(const String& p_text,bool p_right,const String&
 	}
 
 	if (p_action!="") {
-		button->connect("pressed",this,"_custom_action",make_binds(p_action));
+		button->connect("pressed",this,"_custom_action",varray(p_action));
 	}
 
 	return button;
diff --git a/scene/gui/item_list.cpp b/scene/gui/item_list.cpp
index c29f6625d37..b7b2f061eaf 100644
--- a/scene/gui/item_list.cpp
+++ b/scene/gui/item_list.cpp
@@ -187,6 +187,7 @@ void ItemList::select(int p_idx,bool p_single){
 		}
 
 		current=p_idx;
+		ensure_selected_visible=false;
 	} else {
 
 		if (items[p_idx].selectable) {
@@ -195,6 +196,7 @@ void ItemList::select(int p_idx,bool p_single){
 	}
 	update();
 
+
 }
 void ItemList::unselect(int p_idx){
 
@@ -246,12 +248,14 @@ void ItemList::remove_item(int p_idx){
 	update();
 	shape_changed=true;
 
+
 }
 
 void ItemList::clear(){
 
 	items.clear();
 	current=-1;
+	ensure_selected_visible=false;
 	update();
 
 }
@@ -602,18 +606,8 @@ void ItemList::_input_event(const InputEvent& p_event) {
 
 void ItemList::ensure_current_is_visible() {
 
-	if (current>=0 && current <=items.size()) {
-
-		Rect2 r = items[current].rect_cache;
-		int from = scroll_bar->get_val();
-		int to = from + scroll_bar->get_page();
-
-		if (r.pos.y < from) {
-			scroll_bar->set_val(r.pos.y);
-		} else if (r.pos.y+r.size.y > to) {
-			scroll_bar->set_val(r.pos.y+r.size.y - (to-from));
-		}
-	}
+	ensure_selected_visible=true;
+	update();
 }
 
 void ItemList::_notification(int p_what) {
@@ -928,6 +922,24 @@ void ItemList::_notification(int p_what) {
 			draw_line(Vector2(bg->get_margin(MARGIN_LEFT),base_ofs.y+separators[i]),Vector2(size.width-bg->get_margin(MARGIN_LEFT),base_ofs.y+separators[i]),guide_color);
 		}
 
+
+		if (ensure_selected_visible && current>=0 && current <=items.size()) {
+
+			Rect2 r = items[current].rect_cache;
+			int from = scroll_bar->get_val();
+			int to = from + scroll_bar->get_page();
+
+			if (r.pos.y < from) {
+				scroll_bar->set_val(r.pos.y);
+			} else if (r.pos.y+r.size.y > to) {
+				scroll_bar->set_val(r.pos.y+r.size.y - (to-from));
+			}
+
+
+		}
+
+		ensure_selected_visible=false;
+
 	}
 }
 
@@ -1095,6 +1107,7 @@ ItemList::ItemList() {
 	set_focus_mode(FOCUS_ALL);
 	current_columns=1;
 	search_time_msec=0;
+	ensure_selected_visible=false;
 
 }
 
diff --git a/scene/gui/item_list.h b/scene/gui/item_list.h
index 237079c4288..7cf58a64268 100644
--- a/scene/gui/item_list.h
+++ b/scene/gui/item_list.h
@@ -41,6 +41,8 @@ private:
 
 	bool shape_changed;
 
+	bool ensure_selected_visible;
+
 	Vector<Item> items;
 	Vector<int> separators;
 
diff --git a/scene/gui/menu_button.cpp b/scene/gui/menu_button.cpp
index 68fcb4bda8c..13ff7074ea9 100644
--- a/scene/gui/menu_button.cpp
+++ b/scene/gui/menu_button.cpp
@@ -124,7 +124,7 @@ void MenuButton::_set_items(const Array& p_items) {
 
 void MenuButton::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("get_popup"),&MenuButton::get_popup);		
+	ObjectTypeDB::bind_method(_MD("get_popup:PopupMenu"),&MenuButton::get_popup);
 	ObjectTypeDB::bind_method(_MD("_unhandled_key_input"),&MenuButton::_unhandled_key_input);
 	ObjectTypeDB::bind_method(_MD("_set_items"),&MenuButton::_set_items);
 	ObjectTypeDB::bind_method(_MD("_get_items"),&MenuButton::_get_items);
diff --git a/scene/gui/patch_9_frame.cpp b/scene/gui/patch_9_frame.cpp
new file mode 100644
index 00000000000..b6e261714c3
--- /dev/null
+++ b/scene/gui/patch_9_frame.cpp
@@ -0,0 +1,132 @@
+#include "patch_9_frame.h"
+
+#include "servers/visual_server.h"
+
+void Patch9Frame::_notification(int p_what) {
+
+	if (p_what==NOTIFICATION_DRAW) {
+
+		if (texture.is_null())
+			return;
+
+
+		Size2 s=get_size();
+		RID ci = get_canvas_item();
+		VS::get_singleton()->canvas_item_add_style_box(ci,Rect2(Point2(),s),texture->get_rid(),Vector2(margin[MARGIN_LEFT],margin[MARGIN_TOP]),Vector2(margin[MARGIN_RIGHT],margin[MARGIN_BOTTOM]),draw_center,modulate);
+//		draw_texture_rect(texture,Rect2(Point2(),s),false,modulate);
+
+/*
+		Vector<Point2> points;
+		points.resize(4);
+		points[0]=Point2(0,0);
+		points[1]=Point2(s.x,0);
+		points[2]=Point2(s.x,s.y);
+		points[3]=Point2(0,s.y);
+		Vector<Point2> uvs;
+		uvs.resize(4);
+		uvs[0]=Point2(0,0);
+		uvs[1]=Point2(1,0);
+		uvs[2]=Point2(1,1);
+		uvs[3]=Point2(0,1);
+
+		VisualServer::get_singleton()->canvas_item_add_primitive(ci,points,Vector<Color>(),uvs,texture->get_rid());
+*/
+	}
+}
+
+Size2 Patch9Frame::get_minimum_size() const {
+
+	return Size2(margin[MARGIN_LEFT]+margin[MARGIN_RIGHT],margin[MARGIN_TOP]+margin[MARGIN_BOTTOM]);
+}
+void Patch9Frame::_bind_methods() {
+
+
+	ObjectTypeDB::bind_method(_MD("set_texture","texture"), & Patch9Frame::set_texture );
+	ObjectTypeDB::bind_method(_MD("get_texture"), & Patch9Frame::get_texture );
+	ObjectTypeDB::bind_method(_MD("set_modulate","modulate"), & Patch9Frame::set_modulate );
+	ObjectTypeDB::bind_method(_MD("get_modulate"), & Patch9Frame::get_modulate );
+	ObjectTypeDB::bind_method(_MD("set_patch_margin","margin","value"), & Patch9Frame::set_patch_margin );
+	ObjectTypeDB::bind_method(_MD("get_patch_margin","margin"), & Patch9Frame::get_patch_margin );
+	ObjectTypeDB::bind_method(_MD("set_draw_center","draw_center"), & Patch9Frame::set_draw_center );
+	ObjectTypeDB::bind_method(_MD("get_draw_center"), & Patch9Frame::get_draw_center );
+
+	ADD_PROPERTYNZ( PropertyInfo( Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), _SCS("set_texture"),_SCS("get_texture") );
+	ADD_PROPERTYNO( PropertyInfo( Variant::COLOR, "modulate"), _SCS("set_modulate"),_SCS("get_modulate") );
+	ADD_PROPERTYNO( PropertyInfo( Variant::BOOL, "draw_center"), _SCS("set_draw_center"),_SCS("get_draw_center") );
+	ADD_PROPERTYINZ( PropertyInfo( Variant::INT, "patch_margin/left",PROPERTY_HINT_RANGE,"0,16384,1"), _SCS("set_patch_margin"),_SCS("get_patch_margin"),MARGIN_LEFT );
+	ADD_PROPERTYINZ( PropertyInfo( Variant::INT, "patch_margin/top",PROPERTY_HINT_RANGE,"0,16384,1"), _SCS("set_patch_margin"),_SCS("get_patch_margin"),MARGIN_TOP );
+	ADD_PROPERTYINZ( PropertyInfo( Variant::INT, "patch_margin/right",PROPERTY_HINT_RANGE,"0,16384,1"), _SCS("set_patch_margin"),_SCS("get_patch_margin"),MARGIN_RIGHT );
+	ADD_PROPERTYINZ( PropertyInfo( Variant::INT, "patch_margin/bottom",PROPERTY_HINT_RANGE,"0,16384,1"), _SCS("set_patch_margin"),_SCS("get_patch_margin"),MARGIN_BOTTOM );
+
+}
+
+
+void Patch9Frame::set_texture(const Ref<Texture>& p_tex) {
+
+	texture=p_tex;
+	update();
+	//if (texture.is_valid())
+	//	texture->set_flags(texture->get_flags()&(~Texture::FLAG_REPEAT)); //remove repeat from texture, it looks bad in sprites
+	minimum_size_changed();
+}
+
+Ref<Texture> Patch9Frame::get_texture() const {
+
+	return texture;
+}
+
+void Patch9Frame::set_modulate(const Color& p_tex) {
+
+	modulate=p_tex;
+	update();
+}
+
+Color Patch9Frame::get_modulate() const{
+
+	return modulate;
+}
+
+
+void Patch9Frame::set_patch_margin(Margin p_margin,int p_size) {
+
+	ERR_FAIL_INDEX(p_margin,4);
+	margin[p_margin]=p_size;
+	update();
+	minimum_size_changed();
+}
+
+int Patch9Frame::get_patch_margin(Margin p_margin) const{
+
+	ERR_FAIL_INDEX_V(p_margin,4,0);
+	return margin[p_margin];
+}
+
+void Patch9Frame::set_draw_center(bool p_draw) {
+
+	draw_center=p_draw;
+	update();
+}
+
+bool Patch9Frame::get_draw_center() const{
+
+	return draw_center;
+}
+
+Patch9Frame::Patch9Frame() {
+
+
+	margin[MARGIN_LEFT]=0;
+	margin[MARGIN_RIGHT]=0;
+	margin[MARGIN_BOTTOM]=0;
+	margin[MARGIN_TOP]=0;
+	modulate=Color(1,1,1,1);
+	set_ignore_mouse(true);
+	draw_center=true;
+}
+
+
+Patch9Frame::~Patch9Frame()
+{
+}
+
+
diff --git a/scene/gui/patch_9_frame.h b/scene/gui/patch_9_frame.h
new file mode 100644
index 00000000000..562a5b1d771
--- /dev/null
+++ b/scene/gui/patch_9_frame.h
@@ -0,0 +1,40 @@
+#ifndef PATCH_9_FRAME_H
+#define PATCH_9_FRAME_H
+
+#include "scene/gui/control.h"
+/**
+	@author Juan Linietsky <reduzio@gmail.com>
+*/
+class Patch9Frame : public Control {
+
+	OBJ_TYPE(Patch9Frame,Control);
+
+	bool draw_center;
+	int margin[4];
+	Color modulate;
+	Ref<Texture> texture;
+protected:
+
+	void _notification(int p_what);
+	virtual Size2 get_minimum_size() const;
+	static void _bind_methods();
+
+public:
+
+	void set_texture(const Ref<Texture>& p_tex);
+	Ref<Texture> get_texture() const;
+
+	void set_modulate(const Color& p_tex);
+	Color get_modulate() const;
+
+	void set_patch_margin(Margin p_margin,int p_size);
+	int get_patch_margin(Margin p_margin) const;
+
+	void set_draw_center(bool p_enable);
+	bool get_draw_center() const;
+
+	Patch9Frame();
+	~Patch9Frame();
+
+};
+#endif // PATCH_9_FRAME_H
diff --git a/scene/gui/spin_box.cpp b/scene/gui/spin_box.cpp
index 41e775bbff4..a48136f541e 100644
--- a/scene/gui/spin_box.cpp
+++ b/scene/gui/spin_box.cpp
@@ -27,7 +27,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "spin_box.h"
-
+#include "os/input.h"
 
 Size2 SpinBox::get_minimum_size() const {
 
@@ -62,6 +62,13 @@ LineEdit *SpinBox::get_line_edit() {
 }
 
 
+void SpinBox::_line_edit_input(const InputEvent& p_event) {
+
+
+
+}
+
+
 void SpinBox::_input_event(const InputEvent& p_event) {
 
 	if (p_event.type==InputEvent::MOUSE_BUTTON && p_event.mouse_button.pressed) {
@@ -94,6 +101,48 @@ void SpinBox::_input_event(const InputEvent& p_event) {
 			} break;
 		}
 	}
+
+	if (p_event.type==InputEvent::MOUSE_BUTTON && p_event.mouse_button.pressed && p_event.mouse_button.button_index==1) {
+
+		//set_default_cursor_shape(CURSOR_VSIZE);
+		Vector2 cpos = Vector2(p_event.mouse_button.x,p_event.mouse_button.y);
+		drag.mouse_pos=cpos;
+	}
+
+	if (p_event.type==InputEvent::MOUSE_BUTTON && !p_event.mouse_button.pressed && p_event.mouse_button.button_index==1) {
+
+		//set_default_cursor_shape(CURSOR_ARROW);
+		if (drag.enabled) {
+			drag.enabled=false;
+			Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE);
+			warp_mouse(drag.capture_pos);
+		}
+	}
+
+	if (p_event.type==InputEvent::MOUSE_MOTION && p_event.mouse_button.button_mask&1) {
+
+		Vector2 cpos = Vector2(p_event.mouse_motion.x,p_event.mouse_motion.y);
+		if (drag.enabled) {
+
+			float diff_y = drag.mouse_pos.y - cpos.y;
+			diff_y=Math::pow(ABS(diff_y),1.8)*SGN(diff_y);
+			diff_y*=0.1;
+
+			drag.mouse_pos=cpos;
+			drag.base_val=CLAMP(drag.base_val + get_step() * diff_y, get_min(), get_max());
+
+			set_val( drag.base_val);
+
+		} else if (drag.mouse_pos.distance_to(cpos)>2) {
+
+			Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_CAPTURED);
+			drag.enabled=true;
+			drag.base_val=get_val();
+			drag.mouse_pos=cpos;
+			drag.capture_pos=cpos;
+
+		}
+	}
 }
 
 
@@ -177,6 +226,7 @@ void SpinBox::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("is_editable"),&SpinBox::is_editable);
 	ObjectTypeDB::bind_method(_MD("_line_edit_focus_exit"),&SpinBox::_line_edit_focus_exit);
 	ObjectTypeDB::bind_method(_MD("get_line_edit"),&SpinBox::get_line_edit);
+	ObjectTypeDB::bind_method(_MD("_line_edit_input"),&SpinBox::_line_edit_input);
 
 
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL,"editable"),_SCS("set_editable"),_SCS("is_editable"));
@@ -196,4 +246,6 @@ SpinBox::SpinBox() {
 	//connect("value_changed",this,"_value_changed");
 	line_edit->connect("text_entered",this,"_text_entered",Vector<Variant>(),CONNECT_DEFERRED);
 	line_edit->connect("focus_exit",this,"_line_edit_focus_exit",Vector<Variant>(),CONNECT_DEFERRED);
+	line_edit->connect("input_event",this,"_line_edit_input");
+	drag.enabled=false;
 }
diff --git a/scene/gui/spin_box.h b/scene/gui/spin_box.h
index 6ebe14631e3..4c8cb8432a2 100644
--- a/scene/gui/spin_box.h
+++ b/scene/gui/spin_box.h
@@ -44,6 +44,18 @@ class SpinBox : public Range {
 	String prefix;
 	String suffix;
 
+	void _line_edit_input(const InputEvent& p_event);
+
+
+	struct Drag {
+		float base_val;
+		bool enabled;
+		Vector2 from;
+		Vector2	mouse_pos;
+		Vector2 capture_pos;
+	} drag;
+
+
 	void _line_edit_focus_exit();
 
 protected:
diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp
index 6c15f1cae4f..e639b5cb051 100644
--- a/scene/gui/tree.cpp
+++ b/scene/gui/tree.cpp
@@ -31,7 +31,7 @@
 #include "os/os.h"
 #include "os/keyboard.h"
 #include "globals.h"
-
+#include "os/input.h"
 
 
 
@@ -70,6 +70,7 @@ Size2 TreeItem::Cell::get_icon_size() const {
 	else
 		return icon_region.size;
 }
+
 void TreeItem::Cell::draw_icon(const RID& p_where, const Point2& p_pos, const Size2& p_size) const{
 
 	if (icon.is_null())
@@ -728,14 +729,20 @@ TreeItem::~TreeItem() {
 		tree->root=0;
 	}
 
-	if (tree && tree->popup_edited_item==this)
+	if (tree && tree->popup_edited_item==this) {
 		tree->popup_edited_item=NULL;
+		tree->pressing_for_editor=false;
+
+	}
 
 	if (tree && tree->selected_item==this)
 		tree->selected_item=NULL;
 
-	if (tree && tree->edited_item==this)
+	if (tree && tree->edited_item==this) {
 		tree->edited_item=NULL;
+		tree->pressing_for_editor=false;
+	}
+
 
 }
 
@@ -1292,7 +1299,7 @@ void Tree::select_single_item(TreeItem *p_selected,TreeItem *p_current,int p_col
 	
 		} else if (select_mode==SELECT_SINGLE || select_mode==SELECT_MULTI) {
 	
-			if (&selected_cell==&c) {
+			if (!r_in_range && &selected_cell==&c) {
 		
 
 				if (!selected_cell.selected) {
@@ -1301,6 +1308,7 @@ void Tree::select_single_item(TreeItem *p_selected,TreeItem *p_current,int p_col
 					
 					selected_item=p_selected;
 					selected_col=i;
+
 					emit_signal("cell_selected");
 					if (select_mode==SELECT_MULTI)
 						emit_signal("multi_selected",p_current,i,true);
@@ -1317,6 +1325,7 @@ void Tree::select_single_item(TreeItem *p_selected,TreeItem *p_current,int p_col
 
 				if (r_in_range && *r_in_range) {
 
+
 					if (!c.selected && c.selectable) {
 						c.selected=true;
 						emit_signal("multi_selected",p_current,i,true);
@@ -1467,7 +1476,7 @@ int Tree::propagate_mouse_event(const Point2i &p_pos,int x_ofs,int y_ofs,bool p_
 					if (select_mode==SELECT_MULTI && p_mod.shift && selected_item && selected_item!=p_item) {
 
 						bool inrange=false;
-						print_line("SELECT MULTI AND SHIFT AND ALL");
+
 						select_single_item( p_item, root, col,selected_item,&inrange );
 					} else {
 						select_single_item( p_item, root, col );
@@ -1490,7 +1499,7 @@ int Tree::propagate_mouse_event(const Point2i &p_pos,int x_ofs,int y_ofs,bool p_
 
 		/* editing */
 
-		bool bring_up_editor=c.selected && already_selected;
+		bool bring_up_editor=c.selected;// && already_selected;
 		bool bring_up_value_editor=false;
 		String editor_text=c.text;
 
@@ -1605,31 +1614,14 @@ int Tree::propagate_mouse_event(const Point2i &p_pos,int x_ofs,int y_ofs,bool p_
 			return -1;
 
 
-		click_handled=true;
+
+		click_handled=true;		
 		popup_edited_item=p_item;
 		popup_edited_item_col=col;
-		text_editor->set_pos(get_global_pos() + Point2i(col_ofs,_get_title_button_height()+y_ofs)-cache.offset );
-		text_editor->set_size( Size2(col_width,item_h));
-		text_editor->clear();
-		text_editor->set_text( editor_text );
-		text_editor->select_all();
 
-		if (bring_up_value_editor) {
-
-			value_editor->set_pos(get_global_pos() + Point2i(col_ofs,_get_title_button_height()+y_ofs)-cache.offset+Point2i(0,text_editor->get_size().height) );
-			value_editor->set_size( Size2(col_width,1));
-			value_editor->show_modal();
-			updating_value_editor=true;
-			value_editor->set_min( c.min );
-			value_editor->set_max( c.max );
-			value_editor->set_step( c.step );
-			value_editor->set_val( c.val );
-			value_editor->set_exp_unit_value( c.expr );
-			updating_value_editor=false;
-		}
-
-		text_editor->show_modal();
-		text_editor->grab_focus();
+		pressing_item_rect=Rect2(get_global_pos() + Point2i(col_ofs,_get_title_button_height()+y_ofs)-cache.offset,Size2(col_width,item_h));
+		pressing_for_editor_text=editor_text;
+		pressing_for_editor=true;
 
 		return -1; //select
 	} else {
@@ -2062,6 +2054,33 @@ void Tree::_input_event(InputEvent p_event) {
 				update();
 			}
 
+			if (pressing_for_editor && popup_edited_item && popup_edited_item->get_cell_mode(popup_edited_item_col)==TreeItem::CELL_MODE_RANGE) {
+				//range drag
+
+				if (!range_drag_enabled) {
+
+					Vector2 cpos = Vector2(b.x,b.y);
+					if (cpos.distance_to(pressing_pos)>2) {
+						range_drag_enabled=true;
+						range_drag_capture_pos=cpos;
+						range_drag_base=popup_edited_item->get_range(popup_edited_item_col);
+						Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_CAPTURED);
+					}
+				} else {
+
+					TreeItem::Cell &c=popup_edited_item->cells[popup_edited_item_col];
+					float diff_y = -b.relative_y;
+					diff_y=Math::pow(ABS(diff_y),1.8)*SGN(diff_y);
+					diff_y*=0.1;
+					range_drag_base=CLAMP(range_drag_base + c.step * diff_y, c.min, c.max);
+
+					popup_edited_item->set_range(popup_edited_item_col,range_drag_base);
+					item_edited(popup_edited_item_col,popup_edited_item);
+
+				}
+
+			}
+
 			if (drag_touching && ! drag_touching_deaccel) {
 
 
@@ -2084,6 +2103,31 @@ void Tree::_input_event(InputEvent p_event) {
 
 				if (b.button_index==BUTTON_LEFT) {
 
+					if (pressing_for_editor) {
+
+						if (range_drag_enabled) {
+
+							range_drag_enabled=false;
+							Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE);
+							warp_mouse(range_drag_capture_pos);
+						} else {
+							text_editor->set_pos(pressing_item_rect.pos);
+							text_editor->set_size(pressing_item_rect.size);
+
+							text_editor->clear();
+							text_editor->set_text( pressing_for_editor_text );
+							text_editor->select_all();
+
+							text_editor->show_modal();
+							text_editor->grab_focus();
+
+						}
+						pressing_for_editor=false;
+
+					}
+
+
+
 					if (cache.click_type==Cache::CLICK_BUTTON) {
 						emit_signal("button_pressed",cache.click_item,cache.click_column,cache.click_id);
 
@@ -2145,11 +2189,15 @@ void Tree::_input_event(InputEvent p_event) {
 						break;
 
 					click_handled=false;
+					pressing_for_editor=false;
 
 					blocked++;
 					bool handled = propagate_mouse_event(pos+cache.offset,0,0,b.doubleclick,root,b.button_index,b.mod);
 					blocked--;
 
+					if (pressing_for_editor) {
+						pressing_pos=Point2(b.x,b.y);
+					}
 
 
 					if (drag_touching) {
@@ -2360,6 +2408,11 @@ void Tree::_notification(int p_what) {
 		}
 	}
 
+	if (p_what==NOTIFICATION_VISIBILITY_CHANGED) {
+
+		drag_touching=false;
+	}
+
 	if (p_what==NOTIFICATION_ENTER_TREE) {
 
 		update_cache();;
@@ -2610,6 +2663,8 @@ void Tree::clear() {
 	selected_item=NULL;
 	edited_item=NULL;
 	popup_edited_item=NULL;
+	selected_item=NULL;
+	pressing_for_editor=false;
 
 	update();
 };
@@ -3184,6 +3239,8 @@ Tree::Tree() {
 	drag_speed=0;
 	drag_touching=false;
 	drag_touching_deaccel=false;
+	pressing_for_editor=false;
+	range_drag_enabled=false;
 
 }
 
diff --git a/scene/gui/tree.h b/scene/gui/tree.h
index 8ddddd0630e..3fbd7c95d9b 100644
--- a/scene/gui/tree.h
+++ b/scene/gui/tree.h
@@ -258,7 +258,18 @@ friend class TreeItem;
 	TreeItem *popup_edited_item;
 	TreeItem *selected_item;
 	TreeItem *edited_item;
+
+
 	int pressed_button;
+	bool pressing_for_editor;
+	String pressing_for_editor_text;
+	Vector2 pressing_pos;
+	Rect2 pressing_item_rect;
+
+	float range_drag_base;
+	bool range_drag_enabled;
+	Vector2 range_drag_capture_pos;
+
 
 	//TreeItem *cursor_item;
 	//int cursor_column;
diff --git a/scene/io/resource_format_image.cpp b/scene/io/resource_format_image.cpp
index 8527498fc20..f67d50b56c3 100644
--- a/scene/io/resource_format_image.cpp
+++ b/scene/io/resource_format_image.cpp
@@ -31,9 +31,11 @@
 #include "io/image_loader.h"
 #include "globals.h"
 #include "os/os.h"
-RES ResourceFormatLoaderImage::load(const String &p_path,const String& p_original_path) {
-	
+RES ResourceFormatLoaderImage::load(const String &p_path, const String& p_original_path, Error *r_error) {
 	
+	if (r_error)
+		*r_error=ERR_CANT_OPEN;
+
 	if (p_path.extension()=="cube") {
 		// open as cubemap txture
 
@@ -83,6 +85,8 @@ RES ResourceFormatLoaderImage::load(const String &p_path,const String& p_origina
 		memdelete(f);
 
 		cubemap->set_name(p_path.get_file());
+		if (r_error)
+			*r_error=OK;
 
 		return cubemap;
 	
@@ -112,6 +116,8 @@ RES ResourceFormatLoaderImage::load(const String &p_path,const String& p_origina
 
 		ERR_EXPLAIN("Failed loading image: "+p_path);
 		ERR_FAIL_COND_V(err, RES());		
+		if (r_error)
+			*r_error=ERR_FILE_CORRUPT;
 
 #ifdef DEBUG_ENABLED
 #ifdef TOOLS_ENABLED
@@ -199,6 +205,9 @@ RES ResourceFormatLoaderImage::load(const String &p_path,const String& p_origina
 			print_line("  -make texture: "+rtos(total));
 		}
 
+		if (r_error)
+			*r_error=OK;
+
 		return RES( texture );
 	}
 	
diff --git a/scene/io/resource_format_image.h b/scene/io/resource_format_image.h
index 1af65870f81..b5ec5a12007 100644
--- a/scene/io/resource_format_image.h
+++ b/scene/io/resource_format_image.h
@@ -40,7 +40,7 @@ class ResourceFormatLoaderImage : public ResourceFormatLoader {
 	int max_texture_size;
 public:
 
-	virtual RES load(const String &p_path,const String& p_original_path="");
+	virtual RES load(const String &p_path,const String& p_original_path="",Error *r_error=NULL);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual bool handles_type(const String& p_type) const;
 	virtual String get_resource_type(const String &p_path) const;
diff --git a/scene/io/resource_format_wav.cpp b/scene/io/resource_format_wav.cpp
index 7c90a4b3cd0..090348c9338 100644
--- a/scene/io/resource_format_wav.cpp
+++ b/scene/io/resource_format_wav.cpp
@@ -31,13 +31,18 @@
 #include "scene/resources/sample.h"
 
 
-RES ResourceFormatLoaderWAV::load(const String &p_path,const String& p_original_path) {
+RES ResourceFormatLoaderWAV::load(const String &p_path, const String& p_original_path, Error *r_error) {
+	if (r_error)
+		*r_error=ERR_FILE_CANT_OPEN;
 
 	Error err;
 	FileAccess *file=FileAccess::open(p_path, FileAccess::READ,&err);
 
 	ERR_FAIL_COND_V( err!=OK, RES() );
 
+	if (r_error)
+		*r_error=ERR_FILE_CORRUPT;
+
 	/* CHECK RIFF */
 	char riff[5];
 	riff[4]=0;
@@ -244,6 +249,9 @@ RES ResourceFormatLoaderWAV::load(const String &p_path,const String& p_original_
 	file->close();
 	memdelete(file);
 
+	if (r_error)
+		*r_error=OK;
+
 	return sample;
 
 }
diff --git a/scene/io/resource_format_wav.h b/scene/io/resource_format_wav.h
index 081a563d033..a74da041c16 100644
--- a/scene/io/resource_format_wav.h
+++ b/scene/io/resource_format_wav.h
@@ -33,7 +33,7 @@
 
 class ResourceFormatLoaderWAV : public ResourceFormatLoader {
 public:
-	virtual RES load(const String &p_path,const String& p_original_path="");
+	virtual RES load(const String &p_path,const String& p_original_path="",Error *r_error=NULL);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual bool handles_type(const String& p_type) const;
 	virtual String get_resource_type(const String &p_path) const;
diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp
index 717ed93b16a..a53c69815fd 100644
--- a/scene/register_scene_types.cpp
+++ b/scene/register_scene_types.cpp
@@ -52,6 +52,7 @@
 #include "scene/gui/option_button.h"
 #include "scene/gui/color_picker.h"
 #include "scene/gui/texture_frame.h"
+#include "scene/gui/patch_9_frame.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/check_button.h"
@@ -302,6 +303,7 @@ void register_scene_types() {
 	OS::get_singleton()->yield(); //may take time to init
 
 	ObjectTypeDB::register_type<TextureFrame>();
+	ObjectTypeDB::register_type<Patch9Frame>();
 	ObjectTypeDB::register_type<TabContainer>();
 	ObjectTypeDB::register_type<Tabs>();
 	ObjectTypeDB::register_virtual_type<Separator>();
diff --git a/scene/resources/bit_mask.cpp b/scene/resources/bit_mask.cpp
index ef056a6230d..9a6452797a2 100644
--- a/scene/resources/bit_mask.cpp
+++ b/scene/resources/bit_mask.cpp
@@ -205,7 +205,10 @@ BitMap::BitMap() {
 //////////////////////////////////////
 
 
-RES ResourceFormatLoaderBitMap::load(const String &p_path,const String& p_original_path) {
+RES ResourceFormatLoaderBitMap::load(const String &p_path, const String& p_original_path, Error *r_error) {
+
+	if (r_error)
+		*r_error=ERR_FILE_CANT_OPEN;
 
 	BitMap* ptr = memnew(BitMap);
 	Ref<BitMap> bitmap( ptr );
@@ -219,6 +222,8 @@ RES ResourceFormatLoaderBitMap::load(const String &p_path,const String& p_origin
 	ERR_FAIL_COND_V(err, RES());
 
 	bitmap->create_from_image_alpha(image);
+	if (r_error)
+		*r_error=OK;
 
 	return bitmap;
 
diff --git a/scene/resources/bit_mask.h b/scene/resources/bit_mask.h
index 29b7bc66f45..a6b29bb919d 100644
--- a/scene/resources/bit_mask.h
+++ b/scene/resources/bit_mask.h
@@ -66,7 +66,7 @@ class ResourceFormatLoaderBitMap : public ResourceFormatLoader {
 
 public:
 
-	virtual RES load(const String &p_path,const String& p_original_path="");
+	virtual RES load(const String &p_path,const String& p_original_path="",Error *r_error=NULL);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual bool handles_type(const String& p_type) const;
 	virtual String get_resource_type(const String &p_path) const;
diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp
index cd0e67f04d9..f1e97fd6267 100644
--- a/scene/resources/default_theme/default_theme.cpp
+++ b/scene/resources/default_theme/default_theme.cpp
@@ -297,7 +297,7 @@ void make_default_theme() {
 	t->set_color("font_color_hover","MenuButton", control_font_color_hover );
 	t->set_color("font_color_disabled","MenuButton", Color(1,1,1,0.3) );
 
-	t->set_constant("hseparation","MenuButton", 0 );
+	t->set_constant("hseparation","MenuButton", 3 );
 
     // CheckBox
 
diff --git a/scene/resources/shader.cpp b/scene/resources/shader.cpp
index 90598ee789e..a9376faf62f 100644
--- a/scene/resources/shader.cpp
+++ b/scene/resources/shader.cpp
@@ -219,7 +219,10 @@ Shader::~Shader() {
 
 
 
-RES ResourceFormatLoaderShader::load(const String &p_path,const String& p_original_path) {
+RES ResourceFormatLoaderShader::load(const String &p_path, const String& p_original_path, Error *r_error) {
+
+	if (r_error)
+		*r_error=ERR_FILE_CANT_OPEN;
 
 	String fragment_code;
 	String vertex_code;
@@ -235,6 +238,8 @@ RES ResourceFormatLoaderShader::load(const String &p_path,const String& p_origin
 	ERR_FAIL_COND_V(err,RES());
 	String base_path = p_path.get_base_dir();
 
+	if (r_error)
+		*r_error=ERR_FILE_CORRUPT;
 
 	Ref<Shader> shader;//( memnew( Shader ) );
 
@@ -435,6 +440,8 @@ RES ResourceFormatLoaderShader::load(const String &p_path,const String& p_origin
 
 	f->close();
 	memdelete(f);
+	if (r_error)
+		*r_error=OK;
 
 	return shader;
 }
diff --git a/scene/resources/shader.h b/scene/resources/shader.h
index b805cbec96f..61a369c4089 100644
--- a/scene/resources/shader.h
+++ b/scene/resources/shader.h
@@ -126,7 +126,7 @@ public:
 
 class ResourceFormatLoaderShader : public ResourceFormatLoader {
 public:
-	virtual RES load(const String &p_path,const String& p_original_path="");
+	virtual RES load(const String &p_path,const String& p_original_path="",Error *r_error=NULL);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual bool handles_type(const String& p_type) const;
 	virtual String get_resource_type(const String &p_path) const;
diff --git a/scene/resources/theme.cpp b/scene/resources/theme.cpp
index 3060fe41b41..651e234b49d 100644
--- a/scene/resources/theme.cpp
+++ b/scene/resources/theme.cpp
@@ -601,7 +601,9 @@ Theme::~Theme()
 
 
 
-RES ResourceFormatLoaderTheme::load(const String &p_path,const String& p_original_path) {
+RES ResourceFormatLoaderTheme::load(const String &p_path, const String& p_original_path, Error *r_error) {
+	if (r_error)
+		*r_error=ERR_CANT_OPEN;
 
 	Error err;
 	FileAccess *f = FileAccess::open(p_path,FileAccess::READ,&err);
@@ -611,6 +613,8 @@ RES ResourceFormatLoaderTheme::load(const String &p_path,const String& p_origina
 	String base_path = p_path.get_base_dir();
 	Ref<Theme> theme( memnew( Theme ) );
 	Map<StringName,Variant> library;
+	if (r_error)
+		*r_error=ERR_FILE_CORRUPT;
 
 	bool reading_library=false;
 	int line=0;
@@ -1003,6 +1007,9 @@ RES ResourceFormatLoaderTheme::load(const String &p_path,const String& p_origina
 	f->close();
 	memdelete(f);
 
+	if (r_error)
+		*r_error=OK;
+
 	return theme;
 }
 
diff --git a/scene/resources/theme.h b/scene/resources/theme.h
index 802dcb099ce..cfa07625952 100644
--- a/scene/resources/theme.h
+++ b/scene/resources/theme.h
@@ -124,7 +124,7 @@ public:
 
 class ResourceFormatLoaderTheme : public ResourceFormatLoader {
 public:
-	virtual RES load(const String &p_path,const String& p_original_path="");
+	virtual RES load(const String &p_path,const String& p_original_path="",Error *r_error=NULL);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual bool handles_type(const String& p_type) const;
 	virtual String get_resource_type(const String &p_path) const;
diff --git a/servers/physics/area_sw.cpp b/servers/physics/area_sw.cpp
index 83be80f8160..e78f0699cb5 100644
--- a/servers/physics/area_sw.cpp
+++ b/servers/physics/area_sw.cpp
@@ -83,6 +83,10 @@ void AreaSW::set_monitor_callback(ObjectID p_id, const StringName& p_method) {
 
 	_shape_changed();
 
+	if (!moved_list.in_list() && get_space())
+		get_space()->area_add_to_moved_list(&moved_list);
+
+
 }
 
 void AreaSW::set_area_monitor_callback(ObjectID p_id, const StringName& p_method) {
@@ -103,6 +107,10 @@ void AreaSW::set_area_monitor_callback(ObjectID p_id, const StringName& p_method
 
 	_shape_changed();
 
+	if (!moved_list.in_list() && get_space())
+		get_space()->area_add_to_moved_list(&moved_list);
+
+
 }
 
 
@@ -123,7 +131,8 @@ void AreaSW::set_param(PhysicsServer::AreaParameter p_param, const Variant& p_va
 		case PhysicsServer::AREA_PARAM_GRAVITY_IS_POINT: gravity_is_point=p_value; ; break;
 		case PhysicsServer::AREA_PARAM_GRAVITY_DISTANCE_SCALE: gravity_distance_scale=p_value; ; break;
 		case PhysicsServer::AREA_PARAM_GRAVITY_POINT_ATTENUATION:  point_attenuation=p_value; ; break;
-		case PhysicsServer::AREA_PARAM_DENSITY: density=p_value; ; break;
+		case PhysicsServer::AREA_PARAM_LINEAR_DAMP: linear_damp=p_value; ; break;
+		case PhysicsServer::AREA_PARAM_ANGULAR_DAMP: angular_damp=p_value; ; break;
 		case PhysicsServer::AREA_PARAM_PRIORITY: priority=p_value; ; break;
 	}
 
@@ -139,7 +148,8 @@ Variant AreaSW::get_param(PhysicsServer::AreaParameter p_param) const {
 		case PhysicsServer::AREA_PARAM_GRAVITY_IS_POINT: return gravity_is_point;
 		case PhysicsServer::AREA_PARAM_GRAVITY_DISTANCE_SCALE: return gravity_distance_scale;
 		case PhysicsServer::AREA_PARAM_GRAVITY_POINT_ATTENUATION: return  point_attenuation;
-		case PhysicsServer::AREA_PARAM_DENSITY: return density;
+		case PhysicsServer::AREA_PARAM_LINEAR_DAMP: return linear_damp;
+		case PhysicsServer::AREA_PARAM_ANGULAR_DAMP: return angular_damp;
 		case PhysicsServer::AREA_PARAM_PRIORITY: return priority;
 	}
 
@@ -248,7 +258,8 @@ AreaSW::AreaSW() : CollisionObjectSW(TYPE_AREA), monitor_query_list(this),  move
 	gravity_is_point=false;
 	gravity_distance_scale=0;
 	point_attenuation=1;
-	density=0.1;
+	angular_damp=1.0;
+	linear_damp=0.1;
 	priority=0;
 	set_ray_pickable(false);
 	monitor_callback_id=0;
diff --git a/servers/physics/area_sw.h b/servers/physics/area_sw.h
index 26d6a177db8..40ccdaf370e 100644
--- a/servers/physics/area_sw.h
+++ b/servers/physics/area_sw.h
@@ -47,7 +47,8 @@ class AreaSW : public CollisionObjectSW{
 	bool gravity_is_point;
 	float gravity_distance_scale;
 	float point_attenuation;
-	float density;
+	float linear_damp;
+	float angular_damp;
 	int priority;
 	bool monitorable;
 
@@ -145,8 +146,11 @@ public:
 	_FORCE_INLINE_ void set_point_attenuation(float p_point_attenuation) { point_attenuation=p_point_attenuation; }
 	_FORCE_INLINE_ float get_point_attenuation() const { return point_attenuation; }
 
-	_FORCE_INLINE_ void set_density(float p_density) { density=p_density; }
-	_FORCE_INLINE_ float get_density() const { return density; }
+	_FORCE_INLINE_ void set_linear_damp(float p_linear_damp) { linear_damp=p_linear_damp; }
+	_FORCE_INLINE_ float get_linear_damp() const { return linear_damp; }
+
+	_FORCE_INLINE_ void set_angular_damp(float p_angular_damp) { angular_damp=p_angular_damp; }
+	_FORCE_INLINE_ float get_angular_damp() const { return angular_damp; }
 
 	_FORCE_INLINE_ void set_priority(int p_priority) { priority=p_priority; }
 	_FORCE_INLINE_ int get_priority() const { return priority; }
@@ -202,6 +206,7 @@ void AreaSW::remove_area_from_query(AreaSW *p_area, uint32_t p_area_shape,uint32
 	monitored_areas[bk].dec();
 	if (!monitor_query_list.in_list())
 		_queue_monitor_update();
+
 }
 
 
diff --git a/servers/physics/body_sw.cpp b/servers/physics/body_sw.cpp
index 5a528ecf94d..8edbaf0b89b 100644
--- a/servers/physics/body_sw.cpp
+++ b/servers/physics/body_sw.cpp
@@ -159,6 +159,17 @@ void BodySW::set_param(PhysicsServer::BodyParameter p_param, float p_value) {
 			_update_inertia();
 
 		} break;
+		case PhysicsServer::BODY_PARAM_GRAVITY_SCALE: {
+			gravity_scale=p_value;
+		} break;
+		case PhysicsServer::BODY_PARAM_LINEAR_DAMP: {
+
+			linear_damp=p_value;
+		} break;
+		case PhysicsServer::BODY_PARAM_ANGULAR_DAMP: {
+
+			angular_damp=p_value;
+		} break;
 		default:{}
 	}
 }
@@ -177,6 +188,18 @@ float BodySW::get_param(PhysicsServer::BodyParameter p_param) const {
 		case PhysicsServer::BODY_PARAM_MASS: {
 			return mass;
 		} break;
+		case PhysicsServer::BODY_PARAM_GRAVITY_SCALE: {
+			return gravity_scale;
+		} break;
+		case PhysicsServer::BODY_PARAM_LINEAR_DAMP: {
+
+			return linear_damp;
+		} break;
+		case PhysicsServer::BODY_PARAM_ANGULAR_DAMP: {
+
+			return angular_damp;
+		} break;
+
 		default:{}
 	}
 
@@ -380,6 +403,8 @@ void BodySW::integrate_forces(real_t p_step) {
 		return;
 
 	AreaSW *def_area = get_space()->get_default_area();
+	AreaSW *damp_area = def_area;
+
 	ERR_FAIL_COND(!def_area);
 
 	int ac = areas.size();
@@ -388,7 +413,7 @@ void BodySW::integrate_forces(real_t p_step) {
 	if (ac) {
 		areas.sort();
 		const AreaCMP *aa = &areas[0];
-		density = aa[ac-1].area->get_density();
+		damp_area = aa[ac-1].area;
 		for(int i=ac-1;i>=0;i--) {
 			_compute_area_gravity(aa[i].area);
 			if (aa[i].area->get_space_override_mode() == PhysicsServer::AREA_SPACE_OVERRIDE_REPLACE) {
@@ -396,13 +421,25 @@ void BodySW::integrate_forces(real_t p_step) {
 				break;
 			}
 		}
-	} else {
-		density=def_area->get_density();
 	}
+
 	if( !replace ) {
 		_compute_area_gravity(def_area);
 	}
 
+	gravity*=gravity_scale;
+
+	if (angular_damp>=0)
+		area_angular_damp=angular_damp;
+	else
+		area_angular_damp=damp_area->get_angular_damp();
+
+	if (linear_damp>=0)
+		area_linear_damp=linear_damp;
+	else
+		area_linear_damp=damp_area->get_linear_damp();
+
+
 	Vector3 motion;
 	bool do_motion=false;
 
@@ -431,12 +468,12 @@ void BodySW::integrate_forces(real_t p_step) {
 			force+=applied_force;
 			Vector3 torque=applied_torque;
 
-			real_t damp = 1.0 - p_step * density;
+			real_t damp = 1.0 - p_step * area_linear_damp;
 
 			if (damp<0) // reached zero in the given time
 				damp=0;
 
-			real_t angular_damp = 1.0 - p_step * density * get_space()->get_body_angular_velocity_damp_ratio();
+			real_t angular_damp = 1.0 - p_step * area_angular_damp;
 
 			if (angular_damp<0) // reached zero in the given time
 				angular_damp=0;
@@ -695,8 +732,12 @@ BodySW::BodySW() : CollisionObjectSW(TYPE_BODY), active_list(this), inertia_upda
 	island_list_next=NULL;
 	first_time_kinematic=false;
 	_set_static(false);
-	density=0;
+
 	contact_count=0;
+	gravity_scale=1.0;
+
+	area_angular_damp=0;
+	area_linear_damp=0;
 
 	still_time=0;
 	continuous_cd=false;
diff --git a/servers/physics/body_sw.h b/servers/physics/body_sw.h
index 6491ba8f18c..66d814bfd16 100644
--- a/servers/physics/body_sw.h
+++ b/servers/physics/body_sw.h
@@ -50,6 +50,10 @@ class BodySW : public CollisionObjectSW {
 	real_t bounce;
 	real_t friction;
 
+	real_t linear_damp;
+	real_t angular_damp;
+	real_t gravity_scale;
+
 	PhysicsServer::BodyAxisLock axis_lock;
 
 	real_t _inv_mass;
@@ -57,13 +61,16 @@ class BodySW : public CollisionObjectSW {
 	Matrix3 _inv_inertia_tensor;
 
 	Vector3 gravity;
-	real_t density;
 
 	real_t still_time;
 
 	Vector3 applied_force;
 	Vector3 applied_torque;
 
+	float area_angular_damp;
+	float area_linear_damp;
+
+
 	SelfList<BodySW> active_list;
 	SelfList<BodySW> inertia_update_list;
 	SelfList<BodySW> direct_state_query_list;
@@ -233,7 +240,6 @@ public:
 	_FORCE_INLINE_ Matrix3 get_inv_inertia_tensor() const { return _inv_inertia_tensor; }
 	_FORCE_INLINE_ real_t get_friction() const { return friction; }
 	_FORCE_INLINE_ Vector3 get_gravity() const { return gravity; }
-	_FORCE_INLINE_ real_t get_density() const { return density; }
 	_FORCE_INLINE_ real_t get_bounce() const { return bounce; }
 
 	_FORCE_INLINE_ void set_axis_lock(PhysicsServer::BodyAxisLock p_lock) { axis_lock=p_lock; }
@@ -335,8 +341,9 @@ public:
 	BodySW *body;
 	real_t step;
 
-	virtual Vector3 get_total_gravity() const {  return body->get_gravity();  } // get gravity vector working on this body space/area
-	virtual float get_total_density() const {  return body->get_density();  } // get density of this body space/area
+	virtual Vector3 get_total_gravity() const {  return body->gravity;  } // get gravity vector working on this body space/area
+	virtual float get_total_angular_damp() const {  return body->area_angular_damp;  } // get density of this body space/area
+	virtual float get_total_linear_damp() const {  return body->area_linear_damp;  } // get density of this body space/area
 
 	virtual float get_inverse_mass() const {  return body->get_inv_mass();  } // get the mass
 	virtual Vector3 get_inverse_inertia() const { return body->get_inv_inertia();   } // get density of this body space
diff --git a/servers/physics_2d/area_2d_sw.cpp b/servers/physics_2d/area_2d_sw.cpp
index 1a41cda4829..a5a132020a1 100644
--- a/servers/physics_2d/area_2d_sw.cpp
+++ b/servers/physics_2d/area_2d_sw.cpp
@@ -82,6 +82,10 @@ void Area2DSW::set_monitor_callback(ObjectID p_id, const StringName& p_method) {
 
 	_shape_changed();
 
+	if (!moved_list.in_list() && get_space())
+		get_space()->area_add_to_moved_list(&moved_list);
+
+
 }
 
 void Area2DSW::set_area_monitor_callback(ObjectID p_id, const StringName& p_method) {
@@ -102,6 +106,10 @@ void Area2DSW::set_area_monitor_callback(ObjectID p_id, const StringName& p_meth
 
 	_shape_changed();
 
+	if (!moved_list.in_list() && get_space())
+		get_space()->area_add_to_moved_list(&moved_list);
+
+
 }
 
 
diff --git a/servers/physics_2d/body_2d_sw.h b/servers/physics_2d/body_2d_sw.h
index c86bb51f1d8..2fbfcaca600 100644
--- a/servers/physics_2d/body_2d_sw.h
+++ b/servers/physics_2d/body_2d_sw.h
@@ -337,9 +337,9 @@ public:
 	Body2DSW *body;
 	real_t step;
 
-	virtual Vector2 get_total_gravity() const {  return body->get_gravity();  } // get gravity vector working on this body space/area
-	virtual float get_total_angular_damp() const {  return body->get_angular_damp();  } // get density of this body space/area
-	virtual float get_total_linear_damp() const {  return body->get_linear_damp();  } // get density of this body space/area
+	virtual Vector2 get_total_gravity() const {  return body->gravity;  } // get gravity vector working on this body space/area
+	virtual float get_total_angular_damp() const {  return body->area_angular_damp;  } // get density of this body space/area
+	virtual float get_total_linear_damp() const {  return body->area_linear_damp;  } // get density of this body space/area
 
 	virtual float get_inverse_mass() const {  return body->get_inv_mass();  } // get the mass
 	virtual real_t get_inverse_inertia() const { return body->get_inv_inertia();   } // get density of this body space
diff --git a/servers/physics_server.cpp b/servers/physics_server.cpp
index e02601af416..53409acdfba 100644
--- a/servers/physics_server.cpp
+++ b/servers/physics_server.cpp
@@ -39,13 +39,18 @@ void PhysicsDirectBodyState::integrate_forces() {
 
 	Vector3 av = get_angular_velocity();
 
-	float damp = 1.0 - step * get_total_density();
+	float linear_damp = 1.0 - step * get_total_linear_damp();
 
-	if (damp<0) // reached zero in the given time
-		damp=0;
+	if (linear_damp<0) // reached zero in the given time
+		linear_damp=0;
 
-	lv*=damp;
-	av*=damp;
+	float angular_damp = 1.0 - step * get_total_angular_damp();
+
+	if (angular_damp<0) // reached zero in the given time
+		angular_damp=0;
+
+	lv*=linear_damp;
+	av*=angular_damp;
 
 	set_linear_velocity(lv);
 	set_angular_velocity(av);
@@ -70,7 +75,8 @@ PhysicsServer * PhysicsServer::get_singleton() {
 void PhysicsDirectBodyState::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("get_total_gravity"),&PhysicsDirectBodyState::get_total_gravity);
-	ObjectTypeDB::bind_method(_MD("get_total_density"),&PhysicsDirectBodyState::get_total_density);
+	ObjectTypeDB::bind_method(_MD("get_total_linear_damp"),&PhysicsDirectBodyState::get_total_linear_damp);
+	ObjectTypeDB::bind_method(_MD("get_total_angular_damp"),&PhysicsDirectBodyState::get_total_angular_damp);
 
 	ObjectTypeDB::bind_method(_MD("get_inverse_mass"),&PhysicsDirectBodyState::get_inverse_mass);
 	ObjectTypeDB::bind_method(_MD("get_inverse_inertia"),&PhysicsDirectBodyState::get_inverse_inertia);
@@ -683,7 +689,8 @@ void PhysicsServer::_bind_methods() {
 	BIND_CONSTANT( AREA_PARAM_GRAVITY_IS_POINT );
 	BIND_CONSTANT( AREA_PARAM_GRAVITY_DISTANCE_SCALE );
 	BIND_CONSTANT( AREA_PARAM_GRAVITY_POINT_ATTENUATION );
-	BIND_CONSTANT( AREA_PARAM_DENSITY );
+	BIND_CONSTANT( AREA_PARAM_LINEAR_DAMP );
+	BIND_CONSTANT( AREA_PARAM_ANGULAR_DAMP );
 	BIND_CONSTANT( AREA_PARAM_PRIORITY );
 
 	BIND_CONSTANT( AREA_SPACE_OVERRIDE_COMBINE );
@@ -698,6 +705,9 @@ void PhysicsServer::_bind_methods() {
 	BIND_CONSTANT( BODY_PARAM_BOUNCE );
 	BIND_CONSTANT( BODY_PARAM_FRICTION );
 	BIND_CONSTANT( BODY_PARAM_MASS );
+	BIND_CONSTANT( BODY_PARAM_GRAVITY_SCALE );
+	BIND_CONSTANT( BODY_PARAM_ANGULAR_DAMP );
+	BIND_CONSTANT( BODY_PARAM_LINEAR_DAMP );
 	BIND_CONSTANT( BODY_PARAM_MAX );
 
 	BIND_CONSTANT( BODY_STATE_TRANSFORM );
diff --git a/servers/physics_server.h b/servers/physics_server.h
index f66ea590b82..b82d4cf5da3 100644
--- a/servers/physics_server.h
+++ b/servers/physics_server.h
@@ -41,8 +41,9 @@ protected:
 	static void _bind_methods();
 public:
 
-	virtual Vector3 get_total_gravity() const=0; // get gravity vector working on this body space/area
-	virtual float get_total_density() const=0; // get density of this body space/area
+	virtual Vector3 get_total_gravity() const=0;
+	virtual float get_total_angular_damp() const=0;
+	virtual float get_total_linear_damp() const=0;
 
 	virtual float get_inverse_mass() const=0; // get the mass
 	virtual Vector3 get_inverse_inertia() const=0; // get density of this body space
@@ -300,7 +301,8 @@ public:
 		AREA_PARAM_GRAVITY_IS_POINT,
 		AREA_PARAM_GRAVITY_DISTANCE_SCALE,
 		AREA_PARAM_GRAVITY_POINT_ATTENUATION,
-		AREA_PARAM_DENSITY,
+		AREA_PARAM_LINEAR_DAMP,
+		AREA_PARAM_ANGULAR_DAMP,
 		AREA_PARAM_PRIORITY
 	};
 
@@ -398,6 +400,9 @@ public:
 		BODY_PARAM_BOUNCE,
 		BODY_PARAM_FRICTION,
 		BODY_PARAM_MASS, ///< unused for static, always infinite
+		BODY_PARAM_GRAVITY_SCALE,
+		BODY_PARAM_LINEAR_DAMP,
+		BODY_PARAM_ANGULAR_DAMP,
 		BODY_PARAM_MAX,
 	};
 
@@ -411,7 +416,7 @@ public:
 		BODY_STATE_LINEAR_VELOCITY,
 		BODY_STATE_ANGULAR_VELOCITY,
 		BODY_STATE_SLEEPING,
-		BODY_STATE_CAN_SLEEP
+		BODY_STATE_CAN_SLEEP			
 	};
 
 	virtual void body_set_state(RID p_body, BodyState p_state, const Variant& p_variant)=0;
diff --git a/servers/visual/visual_server_raster.cpp b/servers/visual/visual_server_raster.cpp
index b51f59050d2..8b47596d7e6 100644
--- a/servers/visual/visual_server_raster.cpp
+++ b/servers/visual/visual_server_raster.cpp
@@ -7351,6 +7351,8 @@ void VisualServerRaster::_draw_cursors_and_margins() {
 		rasterizer->canvas_draw_rect(Rect2(cursors[i].pos, size), 0, Rect2(), tex, Color(1, 1, 1, 1));
 	};
 
+
+
 	if (black_image[MARGIN_LEFT].is_valid()) {
 		Size2 sz(rasterizer->texture_get_width(black_image[MARGIN_LEFT]),rasterizer->texture_get_height(black_image[MARGIN_LEFT]));
 		rasterizer->canvas_draw_rect(Rect2(0,0,black_margin[MARGIN_LEFT],window_h),0,Rect2(0,0,sz.x,sz.y),black_image[MARGIN_LEFT],Color(1,1,1));
@@ -7362,10 +7364,22 @@ void VisualServerRaster::_draw_cursors_and_margins() {
 		rasterizer->canvas_draw_rect(Rect2(window_w-black_margin[MARGIN_RIGHT],0,black_margin[MARGIN_RIGHT],window_h),0,Rect2(0,0,sz.x,sz.y),black_image[MARGIN_RIGHT],Color(1,1,1));
 	} else if (black_margin[MARGIN_RIGHT])
 		rasterizer->canvas_draw_rect(Rect2(window_w-black_margin[MARGIN_RIGHT],0,black_margin[MARGIN_RIGHT],window_h),0,Rect2(0,0,1,1),RID(),Color(0,0,0));
-	if (black_margin[MARGIN_TOP])
+
+	if (black_image[MARGIN_TOP].is_valid()) {
+		Size2 sz(rasterizer->texture_get_width(black_image[MARGIN_TOP]),rasterizer->texture_get_height(black_image[MARGIN_TOP]));
+		rasterizer->canvas_draw_rect(Rect2(0,0,window_w,black_margin[MARGIN_TOP]),0,Rect2(0,0,sz.x,sz.y),black_image[MARGIN_TOP],Color(1,1,1));
+
+	} else if (black_margin[MARGIN_TOP]) {
 		rasterizer->canvas_draw_rect(Rect2(0,0,window_w,black_margin[MARGIN_TOP]),0,Rect2(0,0,1,1),RID(),Color(0,0,0));
-	if (black_margin[MARGIN_BOTTOM])
+	}
+
+	if (black_image[MARGIN_BOTTOM].is_valid()) {
+
+		Size2 sz(rasterizer->texture_get_width(black_image[MARGIN_BOTTOM]),rasterizer->texture_get_height(black_image[MARGIN_BOTTOM]));
+		rasterizer->canvas_draw_rect(Rect2(0,window_h-black_margin[MARGIN_BOTTOM],window_w,black_margin[MARGIN_BOTTOM]),0,Rect2(0,0,sz.x,sz.y),black_image[MARGIN_BOTTOM],Color(1,1,1));
+	} else if (black_margin[MARGIN_BOTTOM]) {
 		rasterizer->canvas_draw_rect(Rect2(0,window_h-black_margin[MARGIN_BOTTOM],window_w,black_margin[MARGIN_BOTTOM]),0,Rect2(0,0,1,1),RID(),Color(0,0,0));
+	}
 
 	rasterizer->canvas_end_rect();
 };
diff --git a/tools/editor/animation_editor.cpp b/tools/editor/animation_editor.cpp
index d431af6c8d1..96bd1ed27d1 100644
--- a/tools/editor/animation_editor.cpp
+++ b/tools/editor/animation_editor.cpp
@@ -33,6 +33,7 @@
 #include "io/resource_saver.h"
 #include "pair.h"
 #include "scene/gui/separator.h"
+#include "editor_node.h"
 /* Missing to fix:
 
   *Set
@@ -634,9 +635,14 @@ void AnimationKeyEditor::_menu_track(int p_type) {
 	last_menu_track_opt=p_type;
 	switch(p_type) {
 
-		case TRACK_MENU_ADD_VALUE_TRACK:
-		case TRACK_MENU_ADD_TRANSFORM_TRACK:
 		case TRACK_MENU_ADD_CALL_TRACK: {
+			if (root) {
+				call_select->popup_centered_ratio();
+				break;
+			}
+		} break;
+		case TRACK_MENU_ADD_VALUE_TRACK:
+		case TRACK_MENU_ADD_TRANSFORM_TRACK: {
 
 			undo_redo->create_action("Anim Add Track");
 			undo_redo->add_do_method(animation.ptr(),"add_track",p_type);			
@@ -2735,6 +2741,7 @@ void AnimationKeyEditor::_notification(int p_what) {
 
 
 				}
+				call_select->connect("selected",this,"_add_call_track");
 //				rename_anim->set_icon( get_icon("Rename","EditorIcons") );
 /*
 				edit_anim->set_icon( get_icon("Edit","EditorIcons") );
@@ -3456,6 +3463,26 @@ void AnimationKeyEditor::_scale() {
 }
 
 
+void AnimationKeyEditor::_add_call_track(const NodePath& p_base) {
+
+	print_line("BASE IS "+String(p_base));
+	Node* base = EditorNode::get_singleton()->get_edited_scene();
+	if (!base)
+		return;
+	Node* from=base->get_node(p_base);
+	if (!from || !root)
+		return;
+
+	NodePath path = root->get_path_to(from);
+
+	undo_redo->create_action("Anim Add Call Track");
+	undo_redo->add_do_method(animation.ptr(),"add_track",Animation::TYPE_METHOD);
+	undo_redo->add_do_method(animation.ptr(),"track_set_path",animation->get_track_count(),path);
+	undo_redo->add_undo_method(animation.ptr(),"remove_track",animation->get_track_count());
+	undo_redo->commit_action();
+
+}
+
 void AnimationKeyEditor::cleanup() {
 
 	set_animation(Ref<Animation>());
@@ -3503,6 +3530,7 @@ void AnimationKeyEditor::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("_animation_optimize"),&AnimationKeyEditor::_animation_optimize);
 	ObjectTypeDB::bind_method(_MD("_curve_transition_changed"),&AnimationKeyEditor::_curve_transition_changed);
 	ObjectTypeDB::bind_method(_MD("_toggle_edit_curves"),&AnimationKeyEditor::_toggle_edit_curves);
+	ObjectTypeDB::bind_method(_MD("_add_call_track"),&AnimationKeyEditor::_add_call_track);
 
 
 	ADD_SIGNAL( MethodInfo("resource_selected", PropertyInfo( Variant::OBJECT, "res"),PropertyInfo( Variant::STRING, "prop") ) );
@@ -3815,7 +3843,9 @@ AnimationKeyEditor::AnimationKeyEditor(UndoRedo *p_undo_redo, EditorHistory *p_h
 	scale_dialog->connect("confirmed",this,"_scale");
 	add_child(scale_dialog);
 
-
+	call_select = memnew( SceneTreeDialog );
+	add_child(call_select);
+	call_select->set_title("Call Functions in Which Node?");
 
 }
 
diff --git a/tools/editor/animation_editor.h b/tools/editor/animation_editor.h
index 35053fb6a34..4a1cc211543 100644
--- a/tools/editor/animation_editor.h
+++ b/tools/editor/animation_editor.h
@@ -44,7 +44,7 @@
 #include "scene_tree_editor.h"
 #include "editor_data.h"
 #include "property_editor.h"
-
+#include "scene_tree_editor.h"
 
 class AnimationKeyEdit;
 class AnimationCurveEdit;
@@ -206,6 +206,8 @@ class AnimationKeyEditor : public VBoxContainer  {
 
 	PropertyEditor *key_editor;	
 
+	SceneTreeDialog *call_select;
+
 	Ref<Animation> animation;
 	void _update_paths();
 
@@ -299,6 +301,8 @@ class AnimationKeyEditor : public VBoxContainer  {
 	void _toggle_edit_curves();
 	void _animation_len_update();
 
+	void _add_call_track(const NodePath& p_base);
+
 	void _root_removed();
 protected:
 
diff --git a/tools/editor/array_property_edit.cpp b/tools/editor/array_property_edit.cpp
new file mode 100644
index 00000000000..9cd443270b8
--- /dev/null
+++ b/tools/editor/array_property_edit.cpp
@@ -0,0 +1,231 @@
+#include "array_property_edit.h"
+
+#include "editor_node.h"
+
+#define ITEMS_PER_PAGE 100
+
+Variant ArrayPropertyEdit::get_array() const{
+
+	Object*o = ObjectDB::get_instance(obj);
+	if (!o)
+		return Array();
+	Variant arr=o->get(property);
+	if (!arr.is_array()) {
+		Variant::CallError ce;
+		arr=Variant::construct(default_type,NULL,0,ce);
+	}
+	return arr;
+}
+
+void ArrayPropertyEdit::_notif_change() {
+	_change_notify();
+}
+void ArrayPropertyEdit::_notif_changev(const String& p_v) {
+
+	_change_notify(p_v.utf8().get_data());
+}
+
+void ArrayPropertyEdit::_set_size(int p_size) {
+
+	Variant arr = get_array();
+	arr.call("resize",p_size);
+	Object*o = ObjectDB::get_instance(obj);
+	if (!o)
+		return;
+
+	o->set(property,arr);
+
+}
+
+void ArrayPropertyEdit::_set_value(int p_idx,const Variant& p_value) {
+
+	Variant arr = get_array();
+	arr.set(p_idx,p_value);
+	Object*o = ObjectDB::get_instance(obj);
+	if (!o)
+		return;
+
+	o->set(property,arr);
+}
+
+bool ArrayPropertyEdit::_set(const StringName& p_name, const Variant& p_value){
+
+	String pn=p_name;
+
+	if (pn.begins_with("array/")) {
+
+		if (pn=="array/size") {
+
+			Variant arr = get_array();
+			int size = arr.call("size");
+
+			int newsize=p_value;
+			if (newsize==size)
+				return true;
+
+			UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+			ur->create_action("Resize Array");
+			ur->add_do_method(this,"_set_size",newsize);
+			ur->add_undo_method(this,"_set_size",size);
+			if (newsize<size) {
+				for(int i=newsize;i<size;i++) {
+					ur->add_undo_method(this,"_set_value",i,arr.get(i));
+
+				}
+			}
+			ur->add_do_method(this,"_notif_change");
+			ur->add_undo_method(this,"_notif_change");
+			ur->commit_action();
+			return true;
+		}
+		if (pn=="array/page") {
+			page=p_value;
+			_change_notify();
+			return true;
+		}
+	} else if (pn.begins_with("indices")) {
+
+		if (pn.find("_")!=-1) {
+			//type
+			int idx=pn.get_slicec('/',1).get_slicec('_',0).to_int();
+
+			int type = p_value;
+
+			Variant arr = get_array();
+
+			Variant value = arr.get(idx);
+			if (value.get_type()!=type && type>=0 && type<Variant::VARIANT_MAX) {
+				Variant::CallError ce;
+				Variant new_value=Variant::construct(Variant::Type(type),NULL,0,ce);
+				UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+
+				ur->create_action("Change Array Value Type");
+				ur->add_do_method(this,"_set_value",idx,new_value);
+				ur->add_undo_method(this,"_set_value",idx,value);
+				ur->add_do_method(this,"_notif_change");
+				ur->add_undo_method(this,"_notif_change");
+				ur->commit_action();
+
+			}
+			return true;
+
+		} else {
+			int idx=pn.get_slicec('/',1).to_int();
+			Variant arr = get_array();
+
+			Variant value = arr.get(idx);
+			UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+
+			ur->create_action("Change Array Value");
+			ur->add_do_method(this,"_set_value",idx,p_value);
+			ur->add_undo_method(this,"_set_value",idx,value);
+			ur->add_do_method(this,"_notif_changev",p_name);
+			ur->add_undo_method(this,"_notif_changev",p_name);
+			ur->commit_action();
+			return true;
+		}
+	}
+
+	return false;
+}
+
+bool ArrayPropertyEdit::_get(const StringName& p_name,Variant &r_ret) const {
+
+	Variant arr = get_array();
+	//int size = arr.call("size");
+
+	String pn=p_name;
+	if (pn.begins_with("array/")) {
+
+		if (pn=="array/size") {
+			r_ret=arr.call("size");
+			return true;
+		}
+		if (pn=="array/page") {
+			r_ret=page;
+			return true;
+		}
+	} else if (pn.begins_with("indices")) {
+
+		if (pn.find("_")!=-1) {
+			//type
+			int idx=pn.get_slicec('/',1).get_slicec('_',0).to_int();
+			bool valid;
+			r_ret=arr.get(idx,&valid);
+			if (valid)
+				r_ret=r_ret.get_type();
+			return valid;
+
+		} else {
+			int idx=pn.get_slicec('/',1).to_int();
+			bool valid;
+			r_ret=arr.get(idx,&valid);
+			return valid;
+		}
+	}
+
+	return false;
+}
+
+void ArrayPropertyEdit::_get_property_list( List<PropertyInfo> *p_list) const{
+
+	Variant arr = get_array();
+	int size = arr.call("size");
+
+	p_list->push_back( PropertyInfo(Variant::INT,"array/size",PROPERTY_HINT_RANGE,"0,100000,1") );
+	int pages = size/ITEMS_PER_PAGE;
+	if (pages>0)
+		p_list->push_back( PropertyInfo(Variant::INT,"array/page",PROPERTY_HINT_RANGE,"0,"+itos(pages)+",1") );
+
+	int offset=page*ITEMS_PER_PAGE;
+
+	int items=MIN(size-offset,ITEMS_PER_PAGE);
+
+
+	for(int i=0;i<items;i++) {
+
+		Variant v=arr.get(i+offset);
+		if (arr.get_type()==Variant::ARRAY) {
+			p_list->push_back(PropertyInfo(Variant::INT,"indices/"+itos(i+offset)+"_type",PROPERTY_HINT_ENUM,vtypes));
+		}
+		if (arr.get_type()!=Variant::ARRAY || v.get_type()!=Variant::NIL) {
+			PropertyInfo pi(v.get_type(),"indices/"+itos(i+offset));
+			if (v.get_type()==Variant::OBJECT) {
+				pi.hint=PROPERTY_HINT_RESOURCE_TYPE;
+				pi.hint_string="Resource";
+			}
+			p_list->push_back(pi);
+		}
+	}
+
+}
+
+void ArrayPropertyEdit::edit(Object* p_obj,const StringName& p_prop,Variant::Type p_deftype) {
+
+	page=0;
+	property=p_prop;
+	obj=p_obj->get_instance_ID();
+	default_type=p_deftype;
+
+}
+
+void ArrayPropertyEdit::_bind_methods() {
+
+	ObjectTypeDB::bind_method(_MD("_set_size"),&ArrayPropertyEdit::_set_size);
+	ObjectTypeDB::bind_method(_MD("_set_value"),&ArrayPropertyEdit::_set_value);
+	ObjectTypeDB::bind_method(_MD("_notif_change"),&ArrayPropertyEdit::_notif_change);
+	ObjectTypeDB::bind_method(_MD("_notif_changev"),&ArrayPropertyEdit::_notif_changev);
+}
+
+ArrayPropertyEdit::ArrayPropertyEdit()
+{
+	page=0;
+	for(int i=0;i<Variant::VARIANT_MAX;i++) {
+
+		if (i>0)
+			vtypes+=",";
+		vtypes+=Variant::get_type_name( Variant::Type(i) );
+	}
+	default_type=Variant::NIL;
+
+}
diff --git a/tools/editor/array_property_edit.h b/tools/editor/array_property_edit.h
new file mode 100644
index 00000000000..acfb8e68ede
--- /dev/null
+++ b/tools/editor/array_property_edit.h
@@ -0,0 +1,36 @@
+#ifndef ARRAY_PROPERTY_EDIT_H
+#define ARRAY_PROPERTY_EDIT_H
+
+#include "scene/main/node.h"
+
+class ArrayPropertyEdit : public Reference {
+
+	OBJ_TYPE(ArrayPropertyEdit,Reference);
+
+	int page;
+	ObjectID obj;
+	StringName property;
+	String vtypes;
+	Variant get_array() const;
+	Variant::Type default_type;
+
+	void _notif_change();
+	void _notif_changev(const String& p_v);
+	void _set_size(int p_size);
+	void _set_value(int p_idx,const Variant& p_value);
+
+protected:
+
+	static void _bind_methods();
+	bool _set(const StringName& p_name, const Variant& p_value);
+	bool _get(const StringName& p_name,Variant &r_ret) const;
+	void _get_property_list( List<PropertyInfo> *p_list) const;
+
+public:
+
+	void edit(Object* p_obj, const StringName& p_prop, Variant::Type p_deftype);
+
+	ArrayPropertyEdit();
+};
+
+#endif // ARRAY_PROPERTY_EDIT_H
diff --git a/tools/editor/dependency_editor.cpp b/tools/editor/dependency_editor.cpp
new file mode 100644
index 00000000000..c04e82a08a3
--- /dev/null
+++ b/tools/editor/dependency_editor.cpp
@@ -0,0 +1,512 @@
+#include "dependency_editor.h"
+#include "os/file_access.h"
+#include "scene/gui/margin_container.h"
+#include "io/resource_loader.h"
+#include "editor_node.h"
+
+void DependencyEditor::_notification(int p_what){
+
+
+}
+
+void DependencyEditor::_searched(const String& p_path) {
+
+	Map<String,String> dep_rename;
+	dep_rename[replacing]=p_path;
+
+
+	ResourceLoader::rename_dependencies(editing,dep_rename);
+
+	_update_list();
+	_update_file();
+}
+
+void DependencyEditor::_load_pressed(Object* p_item,int p_cell,int p_button){
+
+	TreeItem *ti=p_item->cast_to<TreeItem>();
+	String fname = ti->get_text(0);
+	replacing = ti->get_text(1);
+
+	search->set_title("Search Replacement For: "+replacing.get_file());
+
+	search->clear_filters();
+	List<String> ext;
+	ResourceLoader::get_recognized_extensions_for_type(ti->get_metadata(0),&ext);
+	for (List<String>::Element *E=ext.front();E;E=E->next()) {
+		search->add_filter("*"+E->get());
+	}
+	search->popup_centered_ratio();
+
+}
+
+void DependencyEditor::_fix_and_find(EditorFileSystemDirectory *efsd, Map<String,Map<String,String> >& candidates){
+
+	for(int i=0;i<efsd->get_subdir_count();i++) {
+		_fix_and_find(efsd->get_subdir(i),candidates);
+	}
+
+	for(int i=0;i<efsd->get_file_count();i++) {
+
+		String file = efsd->get_file(i);
+		if (!candidates.has(file))
+			continue;
+
+		String path = efsd->get_file_path(i);
+		Map<String,String> &ss = candidates[file];
+
+
+		for(Map<String,String>::Element *E=candidates[file].front();E;E=E->next()) {
+
+			if (E->get()==String()) {
+				E->get()=path;
+				continue;
+			}
+
+			//must match the best, using subdirs
+			String existing=E->get().replace_first("res://","");
+			String current=path.replace_first("res://","");
+			String lost=E->key().replace_first("res://","");
+
+			Vector<String> existingv=existing.split("/");
+			existingv.invert();
+			Vector<String> currentv=current.split("/");
+			currentv.invert();
+			Vector<String> lostv=lost.split("/");
+			lostv.invert();
+
+			int existing_score=0;
+			int current_score=0;
+
+			for(int j=0;j<lostv.size();j++) {
+
+				if (j<existingv.size() && lostv[j]==existingv[j]) {
+					existing_score++;
+				}
+				if (j<currentv.size() && lostv[j]==currentv[j]) {
+					current_score++;
+				}
+			}
+
+			if (current_score > existing_score) {
+
+				//if it was the same, could track distance to new path but..
+
+				E->get()=path; //replace by more accurate
+			}
+
+		}
+
+	}
+
+}
+
+
+void DependencyEditor::_fix_all(){
+
+	if (!EditorFileSystem::get_singleton()->get_filesystem())
+		return;
+
+	Map<String,Map<String,String> > candidates;
+
+	for (List<String>::Element *E=missing.front();E;E=E->next()) {
+
+		String base = E->get().get_file();
+		if (!candidates.has(base)) {
+			candidates[base]=Map<String,String>();
+		}
+
+		candidates[base][E->get()]="";
+	}
+
+	_fix_and_find(EditorFileSystem::get_singleton()->get_filesystem(),candidates);
+
+	Map<String,String> remaps;
+
+	for (Map<String,Map<String,String> >::Element *E=candidates.front();E;E=E->next()) {
+
+		for (Map<String,String>::Element *F=E->get().front();F;F=F->next()) {
+
+			if (F->get()!=String()) {
+				remaps[F->key()]=F->get();
+			}
+		}
+
+	}
+
+	if (remaps.size()) {
+
+		ResourceLoader::rename_dependencies(editing,remaps);
+
+		_update_list();
+		_update_file();
+	}
+}
+
+void DependencyEditor::_update_file() {
+
+	EditorFileSystem::get_singleton()->update_file(editing);
+
+}
+
+void DependencyEditor::_update_list() {
+
+	List<String> deps;
+	ResourceLoader::get_dependencies(editing,&deps,true);
+
+	tree->clear();
+	missing.clear();
+
+	TreeItem *root = tree->create_item();
+
+	Ref<Texture> folder = get_icon("folder","FileDialog");
+
+	bool broken=false;
+
+	for(List<String>::Element *E=deps.front();E;E=E->next()) {
+
+		TreeItem *item = tree->create_item(root);
+
+		String n = E->get();
+		String path;
+		String type;
+
+		if (n.find("::")!=-1) {
+			path = n.get_slice("::",0);
+			type = n.get_slice("::",1);
+		} else {
+			path=n;
+			type="Resource";
+		}
+		String name = path.get_file();
+
+		Ref<Texture> icon;
+		if (has_icon(type,"EditorIcons")) {
+			icon=get_icon(type,"EditorIcons");
+		} else {
+			icon=get_icon("Object","EditorIcons");
+		}
+		item->set_text(0,name);
+		item->set_icon(0,icon);
+		item->set_metadata(0,type);
+		item->set_text(1,path);
+
+		if (!FileAccess::exists(path)) {
+			item->set_custom_color(1,Color(1,0.4,0.3));
+			missing.push_back(path);
+			broken=true;
+		}
+
+		item->add_button(1,folder,0);
+	}
+
+	fixdeps->set_disabled(!broken);
+
+}
+
+
+
+void DependencyEditor::edit(const String& p_path) {
+
+
+	editing=p_path;
+	set_title("Dependencies For: "+p_path.get_file());
+
+	_update_list();
+	popup_centered_ratio();
+
+	if (EditorNode::get_singleton()->is_scene_open(p_path)) {
+		EditorNode::get_singleton()->show_warning("Scene '"+p_path.get_file()+"' is currently being edited.\nChanges will not take effect unless reloaded.");
+	} else if (ResourceCache::has(p_path)) {
+		EditorNode::get_singleton()->show_warning("Resource '"+p_path.get_file()+"' is in use.\nChanges will take effect when reloaded.");
+	}
+}
+
+
+void DependencyEditor::_bind_methods() {
+
+	ObjectTypeDB::bind_method(_MD("_searched"),&DependencyEditor::_searched);
+	ObjectTypeDB::bind_method(_MD("_load_pressed"),&DependencyEditor::_load_pressed);
+	ObjectTypeDB::bind_method(_MD("_fix_all"),&DependencyEditor::_fix_all);
+
+}
+
+DependencyEditor::DependencyEditor() {
+
+	VBoxContainer *vb = memnew( VBoxContainer );
+	vb->set_name("Dependencies");
+	add_child(vb);
+	set_child_rect(vb);
+
+	tree = memnew( Tree );
+	tree->set_columns(2);
+	tree->set_column_titles_visible(true);
+	tree->set_column_title(0,"Resource");
+	tree->set_column_title(1,"Path");
+	tree->set_hide_root(true);
+	tree->connect("button_pressed",this,"_load_pressed");
+
+	HBoxContainer *hbc = memnew( HBoxContainer );
+	Label *label = memnew( Label("Dependencies:"));
+	hbc->add_child(label);
+	hbc->add_spacer();
+	fixdeps = memnew( Button("Fix Broken"));
+	hbc->add_child(fixdeps);
+	fixdeps->connect("pressed",this,"_fix_all");
+
+	vb->add_child(hbc);
+
+	MarginContainer *mc = memnew( MarginContainer );
+	mc->set_v_size_flags(SIZE_EXPAND_FILL);
+
+	mc->add_child(tree);
+	vb->add_child(mc);
+
+	set_title("Dependency Editor");
+	search = memnew( EditorFileDialog );
+	search->connect("file_selected",this,"_searched");
+	search->set_mode(EditorFileDialog::MODE_OPEN_FILE);
+	search->set_title("Search Replacement Resource:");
+	add_child(search);
+
+}
+
+/////////////////////////////////////
+
+
+
+void DependencyEditorOwners::_fill_owners(EditorFileSystemDirectory *efsd) {
+
+	if (!efsd)
+		return;
+
+	for(int i=0;i<efsd->get_subdir_count();i++) {
+		_fill_owners(efsd->get_subdir(i));
+	}
+
+	for(int i=0;i<efsd->get_file_count();i++) {
+
+		Vector<String> deps = efsd->get_file_deps(i);
+		//print_line(":::"+efsd->get_file_path(i));
+		bool found=false;
+		for(int j=0;j<deps.size();j++) {
+			//print_line("\t"+deps[j]+" vs "+editing);
+			if (deps[j]==editing) {
+				//print_line("found");
+				found=true;
+				break;
+			}
+		}
+		if (!found)
+			continue;
+
+		Ref<Texture> icon;
+		String type=efsd->get_file_type(i);
+		if (!has_icon(type,"EditorIcons")) {
+			icon=get_icon("Object","EditorIcons");
+		} else {
+			icon=get_icon(type,"EditorIcons");
+		}
+
+		owners->add_item(efsd->get_file_path(i),icon);
+	}
+
+}
+
+void DependencyEditorOwners::show(const String& p_path) {
+
+	editing=p_path;
+	owners->clear();
+	_fill_owners(EditorFileSystem::get_singleton()->get_filesystem());
+	popup_centered_ratio();
+
+	set_title("Owners Of: "+p_path.get_file());
+
+}
+
+DependencyEditorOwners::DependencyEditorOwners() {
+
+
+	owners = memnew( ItemList );
+	add_child(owners);
+	set_child_rect(owners);
+
+
+}
+
+///////////////////////
+
+
+void DependencyRemoveDialog::_fill_owners(EditorFileSystemDirectory *efsd) {
+
+	if (!efsd)
+		return;
+
+	for(int i=0;i<efsd->get_subdir_count();i++) {
+		_fill_owners(efsd->get_subdir(i));
+	}
+
+	for(int i=0;i<efsd->get_file_count();i++) {
+
+		Vector<String> deps = efsd->get_file_deps(i);
+		//print_line(":::"+efsd->get_file_path(i));
+		Set<String> met;
+		for(int j=0;j<deps.size();j++) {
+			if (files.has(deps[j])) {
+				met.insert(deps[j]);
+			}
+		}
+		if (!met.size())
+			continue;
+
+		exist=true;
+
+		Ref<Texture> icon;
+		String type=efsd->get_file_type(i);
+		if (!has_icon(type,"EditorIcons")) {
+			icon=get_icon("Object","EditorIcons");
+		} else {
+			icon=get_icon(type,"EditorIcons");
+		}
+
+
+		for(Set<String>::Element *E=met.front();E;E=E->next()) {
+
+			String which = E->get();
+			if (!files[which]) {
+				TreeItem *ti=owners->create_item(owners->get_root());
+				ti->set_text(0,which.get_file());
+				files[which]=ti;
+
+			}
+			TreeItem *ti=owners->create_item(files[which]);
+			ti->set_text(0,efsd->get_file_path(i));
+			ti->set_icon(0,icon);
+		}
+
+	}
+
+}
+
+void DependencyRemoveDialog::show(const Vector<String> &to_erase) {
+
+	exist=false;
+	owners->clear();
+	files.clear();
+	TreeItem *root=owners->create_item();
+	for(int i=0;i<to_erase.size();i++) {
+		files[to_erase[i]]=NULL;
+	}
+
+	_fill_owners(EditorFileSystem::get_singleton()->get_filesystem());
+
+	if (exist) {
+		owners->show();
+		text->set_text("The files being removed are required by other resources in order for them to work.\nRemove them anyway? (no undo)");
+		popup_centered_minsize(Size2(500,220));
+	} else {
+		owners->hide();
+		text->set_text("Remove selected files from the project? (no undo)");
+		popup_centered_minsize(Size2(400,100));
+	}
+
+}
+
+void DependencyRemoveDialog::ok_pressed() {
+
+
+	DirAccess *da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
+	for (Map<String,TreeItem*>::Element *E=files.front();E;E=E->next()) {
+
+		da->remove(E->key());
+		EditorFileSystem::get_singleton()->update_file(E->key());
+	}
+	memdelete(da);
+
+}
+
+DependencyRemoveDialog::DependencyRemoveDialog() {
+
+	VBoxContainer *vb = memnew( VBoxContainer );
+	add_child(vb);
+	set_child_rect(vb);
+
+	text = memnew( Label );
+	vb->add_child(text);
+
+	owners = memnew( Tree );
+	owners->set_hide_root(true);
+	vb->add_child(owners);
+	owners->set_v_size_flags(SIZE_EXPAND_FILL);
+	get_ok()->set_text("Remove");
+}
+
+
+//////////////
+
+
+void DependencyErrorDialog::show(const String& p_for_file,const Vector<String> &report) {
+
+
+	for_file=p_for_file;
+	set_title("Error loading: "+p_for_file.get_file());
+	files->clear();
+
+	TreeItem *root = files->create_item(NULL);
+	for(int i=0;i<report.size();i++) {
+
+		String dep;
+		String type="Object";
+		dep=report[i].get_slice("::",0);
+		if (report[i].get_slice_count("::")>0)
+			type=report[i].get_slice("::",1);
+
+		Ref<Texture> icon;
+		if (!has_icon(type,"EditorIcons")) {
+			icon=get_icon("Object","EditorIcons");
+		} else {
+			icon=get_icon(type,"EditorIcons");
+		}
+
+		TreeItem *ti=files->create_item(root);
+		ti->set_text(0,dep);
+		ti->set_icon(0,icon);
+
+	}
+
+	popup_centered_minsize(Size2(500,220));
+
+}
+
+void DependencyErrorDialog::ok_pressed() {
+
+	EditorNode::get_singleton()->load_scene(for_file,true);
+}
+
+void DependencyErrorDialog::custom_action(const String&) {
+
+	EditorNode::get_singleton()->fix_dependencies(for_file);
+}
+
+DependencyErrorDialog::DependencyErrorDialog() {
+
+	VBoxContainer *vb = memnew( VBoxContainer );
+	add_child(vb);
+	set_child_rect(vb);
+
+
+	files = memnew( Tree );
+	files->set_hide_root(true);
+	vb->add_margin_child("Scene failed to load due to missing dependencies:",files,true);
+	files->set_v_size_flags(SIZE_EXPAND_FILL);
+	get_ok()->set_text("Open Anyway");
+
+	text = memnew( Label );
+	vb->add_child(text);
+	text->set_text("Which action should be taken?");
+
+
+	fdep=add_button("Fix Dependencies",true,"fixdeps");
+
+	set_title("Errors loading!");
+
+}
diff --git a/tools/editor/dependency_editor.h b/tools/editor/dependency_editor.h
new file mode 100644
index 00000000000..1c328e7a93d
--- /dev/null
+++ b/tools/editor/dependency_editor.h
@@ -0,0 +1,94 @@
+#ifndef DEPENDENCY_EDITOR_H
+#define DEPENDENCY_EDITOR_H
+
+#include "scene/gui/dialogs.h"
+#include "scene/gui/tree.h"
+#include "scene/gui/tab_container.h"
+#include "editor_file_dialog.h"
+
+class EditorFileSystemDirectory;
+
+class DependencyEditor : public AcceptDialog {
+	OBJ_TYPE(DependencyEditor,AcceptDialog);
+
+
+	Tree *tree;
+	Button *fixdeps;
+
+	EditorFileDialog *search;
+
+	String replacing;
+	String editing;
+	List<String> missing;
+
+
+	void _fix_and_find(EditorFileSystemDirectory *efsd, Map<String,Map<String,String> >& candidates);
+
+	void _searched(const String& p_path);
+	void _load_pressed(Object* p_item,int p_cell,int p_button);
+	void _fix_all();
+	void _update_list();
+
+	void _update_file();
+
+protected:
+
+	static void _bind_methods();
+	void _notification(int p_what);
+public:
+
+
+	void edit(const String& p_path);
+	DependencyEditor();
+};
+
+class DependencyEditorOwners : public AcceptDialog {
+	OBJ_TYPE(DependencyEditorOwners,AcceptDialog);
+
+	ItemList *owners;
+	String editing;
+	void _fill_owners(EditorFileSystemDirectory *efsd);
+
+public:
+
+	void show(const String& p_path);
+	DependencyEditorOwners();
+};
+
+class DependencyRemoveDialog : public ConfirmationDialog {
+	OBJ_TYPE(DependencyRemoveDialog,ConfirmationDialog);
+
+
+	Label *text;
+	Tree *owners;
+	bool exist;
+	Map<String,TreeItem*> files;
+	void _fill_owners(EditorFileSystemDirectory *efsd);
+
+	void ok_pressed();
+
+public:
+
+	void show(const Vector<String> &to_erase);
+	DependencyRemoveDialog();
+};
+
+
+class DependencyErrorDialog : public ConfirmationDialog {
+	OBJ_TYPE(DependencyErrorDialog,ConfirmationDialog);
+
+
+	String for_file;
+	Button *fdep;
+	Label *text;
+	Tree *files;
+	void ok_pressed();
+	void custom_action(const String&);
+
+public:
+
+	void show(const String& p_for,const Vector<String> &report);
+	DependencyErrorDialog();
+};
+
+#endif // DEPENDENCY_EDITOR_H
diff --git a/tools/editor/editor_data.cpp b/tools/editor/editor_data.cpp
index 7f42f19a9b4..673ee30adbc 100644
--- a/tools/editor/editor_data.cpp
+++ b/tools/editor/editor_data.cpp
@@ -39,7 +39,7 @@ void EditorHistory::_cleanup_history() {
 		bool fail=false;
 
 		for(int j=0;j<history[i].path.size();j++) {
-			if (!history[i].path[j].res.is_null())
+			if (!history[i].path[j].ref.is_null())
 				continue;
 
 			if (ObjectDB::get_instance(history[i].path[j].object))
@@ -70,10 +70,10 @@ void EditorHistory::_add_object(ObjectID p_object,const String& p_property,int p
 
 	Object *obj = ObjectDB::get_instance(p_object);
 	ERR_FAIL_COND(!obj);
-	Resource *r = obj->cast_to<Resource>();
+	Reference *r = obj->cast_to<Reference>();
 	Obj o;
 	if (r)
-		o.res=RES(r);
+		o.ref=REF(r);
 	o.object=p_object;
 	o.property=p_property;
 
@@ -123,6 +123,27 @@ void EditorHistory::add_object(ObjectID p_object,int p_relevel){
 	_add_object(p_object,"",p_relevel);
 }
 
+int EditorHistory::get_history_len() {
+	return history.size();
+}
+int EditorHistory::get_history_pos() {
+	return current;
+}
+
+ObjectID EditorHistory::get_history_obj(int p_obj) const {
+	ERR_FAIL_INDEX_V(p_obj,history.size(),0);
+	ERR_FAIL_INDEX_V(history[p_obj].level,history[p_obj].path.size(),0);
+	return history[p_obj].path[history[p_obj].level].object;
+}
+
+bool EditorHistory::is_at_begining() const {
+	return current<=0;
+}
+bool EditorHistory::is_at_end() const {
+
+	return ((current+1)>=history.size());
+}
+
 
 bool EditorHistory::next() {
 
@@ -523,7 +544,7 @@ Ref<Script> EditorData::get_scene_root_script(int p_idx) const {
 	if (!edited_scene[p_idx].root)
 		return Ref<Script>();
 	Ref<Script> s=edited_scene[p_idx].root->get_script();
-	if (!s.is_valid()) {
+	if (!s.is_valid() && edited_scene[p_idx].root->get_child_count()) {
 		Node *n = edited_scene[p_idx].root->get_child(0);
 		while(!s.is_valid() && n && n->get_filename()==String()) {
 			s=n->get_script();
diff --git a/tools/editor/editor_data.h b/tools/editor/editor_data.h
index cbec2295f69..c5ee83ae634 100644
--- a/tools/editor/editor_data.h
+++ b/tools/editor/editor_data.h
@@ -45,7 +45,7 @@ class EditorHistory {
 
 	struct Obj {
 
-		RES res;
+		REF ref;
 		ObjectID object;
 		String property;
 	};
@@ -75,10 +75,17 @@ friend class EditorData;
 
 public:
 
+	bool is_at_begining() const;
+	bool is_at_end() const;
+
 	void add_object(ObjectID p_object);
 	void add_object(ObjectID p_object,const String& p_subprop);
 	void add_object(ObjectID p_object,int p_relevel);
 
+	int get_history_len();
+	int get_history_pos();
+	ObjectID get_history_obj(int p_obj) const;
+
 	bool next();
 	bool previous();
 	ObjectID get_current();
diff --git a/tools/editor/editor_file_dialog.cpp b/tools/editor/editor_file_dialog.cpp
index b1bbd71f7b3..c62347d129e 100644
--- a/tools/editor/editor_file_dialog.cpp
+++ b/tools/editor/editor_file_dialog.cpp
@@ -190,7 +190,7 @@ void EditorFileDialog::_thumbnail_done(const String& p_path,const Ref<Texture>&
 void EditorFileDialog::_request_single_thumbnail(const String& p_path) {
 
 	EditorResourcePreview::get_singleton()->queue_resource_preview(p_path,this,"_thumbnail_done",p_path);
-	print_line("want file "+p_path);
+	//print_line("want file "+p_path);
 	set_process(true);
 	preview_waiting=true;
 	preview_wheel_timeout=0;
@@ -359,7 +359,7 @@ void EditorFileDialog::_item_dc_selected(int p_item) {
 
 	if (d["dir"]) {
 
-		print_line("change dir: "+String(d["name"]));
+		//print_line("change dir: "+String(d["name"]));
 		dir_access->change_dir(d["name"]);
 		if (mode==MODE_OPEN_FILE || mode==MODE_OPEN_FILES || mode==MODE_OPEN_DIR)
 			file->set_text("");
@@ -536,6 +536,7 @@ void EditorFileDialog::update_file_list() {
 
 			if (get_icon_func) {
 
+				
 				Ref<Texture> icon = get_icon_func(base_dir.plus_file(files.front()->get()));
 				//ti->set_icon(0,icon);
 				if (display_mode==DISPLAY_THUMBNAILS) {
diff --git a/tools/editor/editor_file_system.cpp b/tools/editor/editor_file_system.cpp
index d741087a9f6..33e4a15c85f 100644
--- a/tools/editor/editor_file_system.cpp
+++ b/tools/editor/editor_file_system.cpp
@@ -94,6 +94,12 @@ bool EditorFileSystemDirectory::get_file_meta(int p_idx) const {
 	return files[p_idx].meta.enabled;
 }
 
+Vector<String> EditorFileSystemDirectory::get_file_deps(int p_idx) const {
+
+	ERR_FAIL_INDEX_V(p_idx,files.size(),Vector<String>());
+	return files[p_idx].meta.deps;
+
+}
 Vector<String> EditorFileSystemDirectory::get_missing_sources(int p_idx) const {
 
 	ERR_FAIL_INDEX_V(p_idx,files.size(),Vector<String>());
@@ -118,7 +124,7 @@ bool EditorFileSystemDirectory::is_missing_sources(int p_idx) const {
 	return false;
 }
 
-String EditorFileSystemDirectory::get_file_type(int p_idx) const {
+StringName EditorFileSystemDirectory::get_file_type(int p_idx) const {
 
 	ERR_FAIL_INDEX_V(p_idx,files.size(),"");
 	return files[p_idx].type;
@@ -198,6 +204,13 @@ EditorFileSystemDirectory::ImportMeta EditorFileSystem::_get_meta(const String&
 		}
 		m.import_editor=imd->get_editor();
 	}
+
+	List<String> deps;
+	ResourceLoader::get_dependencies(p_path,&deps);
+	for(List<String>::Element *E=deps.front();E;E=E->next()) {
+		m.deps.push_back(E->get());
+	}
+
 	return m;
 }
 
@@ -358,7 +371,7 @@ void EditorFileSystem::_scan_scenes() {
 
 	String project=Globals::get_singleton()->get_resource_path();
 
-	String fscache = EditorSettings::get_singleton()->get_project_settings_path().plus_file("file_cache");
+	String fscache = EditorSettings::get_singleton()->get_project_settings_path().plus_file("filesystem_cache");
 	FileAccess *f =FileAccess::open(fscache,FileAccess::READ);
 
 	if (f) {
@@ -397,7 +410,7 @@ void EditorFileSystem::_scan_scenes() {
 
 			} else {
 				Vector<String> split = l.split("::");
-				ERR_CONTINUE( split.size() != 4);
+				ERR_CONTINUE( split.size() != 5);
 				String name = split[0];
 				String file;
 
@@ -429,6 +442,15 @@ void EditorFileSystem::_scan_scenes() {
 					}
 
 				}
+				String deps = split[4].strip_edges();
+				if (deps.length()) {
+					Vector<String> dp = deps.split("<>");
+					for(int i=0;i<dp.size();i++) {
+						String path=dp[i];
+						fc.meta.deps.push_back(path);
+					}
+				}
+
 				file_cache[name]=fc;
 
 				ERR_CONTINUE(!dc);
@@ -530,6 +552,7 @@ void EditorFileSystem::scan() {
 		thread = Thread::create(_thread_func,this,s);
 		//tree->hide();
 		//progress->show();
+
 	}
 
 
@@ -798,6 +821,14 @@ void EditorFileSystem::_save_type_cache_fs(DirItem *p_dir,FileAccess *p_file) {
 
 			}
 		}
+		s+="::";
+		for(int j=0;j<p_dir->files[i]->meta.deps.size();j++) {
+
+			if (j>0)
+				s+="<>";
+			s+=p_dir->files[i]->meta.deps[j];
+		}
+
 		p_file->store_line(s);
 	}
 
@@ -1037,6 +1068,13 @@ void EditorFileSystem::update_file(const String& p_file) {
 		return;
     }
 
+    if (!FileAccess::exists(p_file)) {
+	    //was removed
+	    fs->files.remove(cpos);
+	    call_deferred("emit_signal","filesystem_changed"); //update later
+	    return;
+
+    }
 
     String type = ResourceLoader::get_resource_type(p_file);
 
diff --git a/tools/editor/editor_file_system.h b/tools/editor/editor_file_system.h
index 3f413292fe0..f79dd209ef5 100644
--- a/tools/editor/editor_file_system.h
+++ b/tools/editor/editor_file_system.h
@@ -59,13 +59,14 @@ class EditorFileSystemDirectory : public Object {
 
 		Vector<Source> sources;
 		String import_editor;
+		Vector<String> deps;
 		bool enabled;
 
 	};
 
 	struct FileInfo {
 		String file;
-		String type;
+		StringName type;
 		uint64_t modified_time;
 
 		ImportMeta meta;
@@ -87,10 +88,11 @@ public:
 	int get_file_count() const;
 	String get_file(int p_idx) const;
 	String get_file_path(int p_idx) const;
-	String get_file_type(int p_idx) const;
+	StringName get_file_type(int p_idx) const;
 	bool get_file_meta(int p_idx) const;
 	bool is_missing_sources(int p_idx) const;
 	Vector<String> get_missing_sources(int p_idx) const;
+	Vector<String> get_file_deps(int p_idx) const;
 
 	EditorFileSystemDirectory *get_parent();
 
@@ -120,7 +122,7 @@ class EditorFileSystem : public Node {
 		String path;
 		String name;
 		Vector<DirItem*> dirs;
-		Vector<SceneItem*> files;
+		Vector<SceneItem*> files;		
 		~DirItem();
 	};
 
@@ -149,6 +151,7 @@ class EditorFileSystem : public Node {
 		String type;
 		uint64_t modification_time;
 		EditorFileSystemDirectory::ImportMeta meta;
+		Vector<String> deps;
 	};
 
 	struct DirCache {
diff --git a/tools/editor/editor_import_export.cpp b/tools/editor/editor_import_export.cpp
index b28b349c861..84fc14d2ecd 100644
--- a/tools/editor/editor_import_export.cpp
+++ b/tools/editor/editor_import_export.cpp
@@ -255,7 +255,16 @@ static void _add_filter_to_list(Set<StringName>& r_list,const String& p_filter)
 
 }
 
+Vector<uint8_t> EditorExportPlatform::get_exported_file_default(String& p_fname) const {
 
+	FileAccess *f = FileAccess::open(p_fname,FileAccess::READ);
+	ERR_FAIL_COND_V(!f,Vector<uint8_t>());
+	Vector<uint8_t> ret;
+	ret.resize(f->get_len());
+	int rbs = f->get_buffer(ret.ptr(),ret.size());
+	memdelete(f);
+	return ret;
+}
 
 Vector<uint8_t> EditorExportPlatform::get_exported_file(String& p_fname) const {
 
@@ -270,13 +279,9 @@ Vector<uint8_t> EditorExportPlatform::get_exported_file(String& p_fname) const {
 	}
 
 
-	FileAccess *f = FileAccess::open(p_fname,FileAccess::READ);
-	ERR_FAIL_COND_V(!f,Vector<uint8_t>());
-	Vector<uint8_t> ret;
-	ret.resize(f->get_len());
-	int rbs = f->get_buffer(ret.ptr(),ret.size());
-	memdelete(f);
-	return ret;
+	return get_exported_file_default(p_fname);
+
+
 }
 
 Vector<StringName> EditorExportPlatform::get_dependencies(bool p_bundles) const {
@@ -557,6 +562,7 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func
 		group_shrink*=EditorImportExport::get_singleton()->get_export_image_shrink();
 
 		switch(EditorImportExport::get_singleton()->image_export_group_get_image_action(E->get())) {
+			case EditorImportExport::IMAGE_ACTION_KEEP:
 			case EditorImportExport::IMAGE_ACTION_NONE: {
 
 				switch(EditorImportExport::get_singleton()->get_export_image_action()) {
@@ -581,7 +587,7 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func
 			} break; //use default
 			case EditorImportExport::IMAGE_ACTION_COMPRESS_RAM: {
 				group_format=EditorTextureImportPlugin::IMAGE_FORMAT_COMPRESS_RAM;
-			} break; //use default
+			} break; //use default						
 		}
 
 		String image_list_md5;
@@ -825,13 +831,32 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func
 
 
 	StringName engine_cfg="res://engine.cfg";
+	StringName boot_splash;
+	{
+		String splash=Globals::get_singleton()->get("application/boot_splash"); //avoid splash from being converted
+		splash=splash.strip_edges();
+		if (splash!=String()) {
+			if (!splash.begins_with("res://"))
+				splash="res://"+splash;
+			splash=splash.simplify_path();
+			boot_splash=splash;
+		}
+	}
+
+
+
 
 	for(int i=0;i<files.size();i++) {
 
 		if (remap_files.has(files[i]) || files[i]==engine_cfg) //gonna be remapped (happened before!)
 			continue; //from atlas?
 		String src=files[i];
-		Vector<uint8_t> buf = get_exported_file(src);
+		Vector<uint8_t> buf;
+
+		if (src==boot_splash)
+			buf = get_exported_file_default(src); //bootsplash must be kept if used
+		else
+			buf = get_exported_file(src);
 
 		ERR_CONTINUE( saved.has(src) );
 
@@ -1608,6 +1633,8 @@ void EditorImportExport::load_config() {
 					g.action=IMAGE_ACTION_COMPRESS_RAM;
 				else if (action=="compress_disk")
 					g.action=IMAGE_ACTION_COMPRESS_DISK;
+				else if (action=="keep")
+					g.action=IMAGE_ACTION_KEEP;
 			}
 
 			if (d.has("atlas"))
@@ -1735,6 +1762,7 @@ void EditorImportExport::save_config() {
 			case IMAGE_ACTION_NONE: d["action"]="default"; break;
 			case IMAGE_ACTION_COMPRESS_RAM: d["action"]="compress_ram"; break;
 			case IMAGE_ACTION_COMPRESS_DISK: d["action"]="compress_disk"; break;
+			case IMAGE_ACTION_KEEP: d["action"]="keep"; break;
 		}
 
 
diff --git a/tools/editor/editor_import_export.h b/tools/editor/editor_import_export.h
index f134a479a4f..d8601929cf0 100644
--- a/tools/editor/editor_import_export.h
+++ b/tools/editor/editor_import_export.h
@@ -83,6 +83,7 @@ public:
 	typedef Error (*EditorExportSaveFunction)(void *p_userdata,const String& p_path, const Vector<uint8_t>& p_data,int p_file,int p_total);
 protected:
 
+	Vector<uint8_t> get_exported_file_default(String& p_fname) const;
 	virtual Vector<uint8_t> get_exported_file(String& p_fname) const;
 	virtual Vector<StringName> get_dependencies(bool p_bundles) const;
 
@@ -227,6 +228,8 @@ public:
 		IMAGE_ACTION_NONE,
 		IMAGE_ACTION_COMPRESS_DISK,
 		IMAGE_ACTION_COMPRESS_RAM,
+		IMAGE_ACTION_KEEP //for group
+
 	};
 
 	enum ScriptAction {
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index b0a2c568de2..63684dcc93e 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -93,7 +93,7 @@
 #include "plugins/light_occluder_2d_editor_plugin.h"
 #include "plugins/color_ramp_editor_plugin.h"
 #include "plugins/collision_shape_2d_editor_plugin.h"
-
+#include "os/input.h"
 // end
 #include "tools/editor/io_plugins/editor_texture_import_plugin.h"
 #include "tools/editor/io_plugins/editor_scene_import_plugin.h"
@@ -459,17 +459,74 @@ void EditorNode::open_resource(const String& p_type) {
 	current_option=RESOURCE_LOAD;
 }
 
+
+void EditorNode::save_resource_in_path(const Ref<Resource>& p_resource,const String& p_path) {
+
+	editor_data.apply_changes_in_editors();
+	int flg=0;
+	if (EditorSettings::get_singleton()->get("on_save/compress_binary_resources"))
+		flg|=ResourceSaver::FLAG_COMPRESS;
+	if (EditorSettings::get_singleton()->get("on_save/save_paths_as_relative"))
+		flg|=ResourceSaver::FLAG_RELATIVE_PATHS;
+
+	String path = Globals::get_singleton()->localize_path(p_path);
+	Error err = ResourceSaver::save(path,p_resource,flg|ResourceSaver::FLAG_REPLACE_SUBRESOURCE_PATHS);
+
+	if (err!=OK) {
+		accept->set_text("Error saving resource!");
+		accept->popup_centered_minsize();
+	return;
+	}
+//	EditorFileSystem::get_singleton()->update_file(path,p_resource->get_type());
+
+	((Resource*)p_resource.ptr())->set_path(path);
+	emit_signal("resource_saved",p_resource);
+
+}
+
 void EditorNode::save_resource(const Ref<Resource>& p_resource) {
 
-
-	ERR_FAIL_COND(p_resource.is_null() || p_resource->get_path()=="" || p_resource->get_path().find("::")!=-1);
-	resources_dock->save_resource(p_resource->get_path(),p_resource);
+	if (p_resource->get_path().is_resource_file()) {
+		save_resource_in_path(p_resource,p_resource->get_path());
+	} else {
+		save_resource_as(p_resource);
+	}
 }
 
 void EditorNode::save_resource_as(const Ref<Resource>& p_resource) {
 
-	resources_dock->save_resource_as(p_resource);
+	file->set_mode(EditorFileDialog::MODE_SAVE_FILE);
+	bool relpaths =  (p_resource->has_meta("__editor_relpaths__") && p_resource->get_meta("__editor_relpaths__").operator bool());
 
+	List<String> extensions;
+	Ref<PackedScene> sd = memnew( PackedScene );
+	ResourceSaver::get_recognized_extensions(p_resource,&extensions);
+	file->clear_filters();
+	for(int i=0;i<extensions.size();i++) {
+
+		file->add_filter("*."+extensions[i]+" ; "+extensions[i].to_upper());
+	}
+
+	//file->set_current_path(current_path);
+	if (p_resource->get_path()!="") {
+		file->set_current_path(p_resource->get_path());
+		if (extensions.size()) {
+			String ext=p_resource->get_path().extension().to_lower();
+			if (extensions.find(ext)==NULL) {
+				file->set_current_path(p_resource->get_path().replacen("."+ext,"."+extensions.front()->get()));
+			}
+		}
+	} else {
+
+		String existing;
+		if (extensions.size()) {
+			existing="new_"+p_resource->get_type().to_lower()+"."+extensions.front()->get().to_lower();
+		}
+		file->set_current_path(existing);
+
+	}
+	file->popup_centered_ratio();
+	file->set_title("Save Resource As..");
 }
 
 
@@ -1049,7 +1106,7 @@ void EditorNode::_dialog_action(String p_file) {
 
 
 			push_item(res.operator->() );
-		} break;
+		} break;			
 		case FILE_OPEN_SCENE: {
 
 
@@ -1320,7 +1377,20 @@ void EditorNode::_dialog_action(String p_file) {
 			unzClose(pkg);
 
 		} break;
+		case RESOURCE_SAVE:
+		case RESOURCE_SAVE_AS: {
 
+
+			uint32_t current = editor_history.get_current();
+			Object *current_obj = current>0 ? ObjectDB::get_instance(current) : NULL;
+
+			ERR_FAIL_COND(!current_obj->cast_to<Resource>())
+
+			RES current_res = RES(current_obj->cast_to<Resource>());
+
+			save_resource_in_path(current_res,p_file);
+
+		} break;
 		default: { //save scene?
 		
 			
@@ -1358,6 +1428,67 @@ void EditorNode::push_item(Object *p_object,const String& p_property) {
 
 }
 
+void EditorNode::_select_history(int p_idx) {
+
+	//push it to the top, it is not correct, but it's more useful
+	ObjectID id=editor_history.get_history_obj(p_idx);
+	Object* obj=ObjectDB::get_instance(id);
+	if (!obj)
+		return;
+	push_item(obj);
+}
+
+void EditorNode::_prepare_history() {
+
+	int history_to = MAX(0,editor_history.get_history_len()-25);
+
+	editor_history_menu->get_popup()->clear();
+
+	Ref<Texture> base_icon = gui_base->get_icon("Object","EditorIcons");
+	Set<ObjectID> already;
+	for(int i=editor_history.get_history_len()-1;i>=history_to;i--) {
+
+
+		ObjectID id=editor_history.get_history_obj(i);
+		Object* obj=ObjectDB::get_instance(id);
+		if (!obj || already.has(id)) {
+			if (history_to>0) {
+				history_to--;
+			}
+			continue;
+		}
+
+		already.insert(id);
+
+		Ref<Texture> icon = gui_base->get_icon("Object","EditorIcons");
+		if (gui_base->has_icon(obj->get_type(),"EditorIcons"))
+			icon=gui_base->get_icon(obj->get_type(),"EditorIcons");
+		else
+			icon=base_icon;
+
+		String text;
+		if (obj->cast_to<Resource>()) {
+			Resource *r=obj->cast_to<Resource>();
+			if (r->get_path().is_resource_file())
+				text=r->get_path().get_file();
+			else if (r->get_name()!=String()) {
+				text=r->get_name();
+			} else {
+				text=r->get_type();
+			}
+		} else if (obj->cast_to<Node>()) {
+			text=obj->cast_to<Node>()->get_name();
+		} else {
+			text=obj->get_type();
+		}
+
+		if (i==editor_history.get_history_pos()) {
+			text="["+text+"]";
+		}
+		editor_history_menu->get_popup()->add_icon_item(icon,text,i);
+	}
+}
+
 void EditorNode::_property_editor_forward() {
 
 	if (editor_history.next())
@@ -1402,6 +1533,9 @@ void EditorNode::_edit_current() {
 	uint32_t current = editor_history.get_current();
 	Object *current_obj = current>0 ? ObjectDB::get_instance(current) : NULL;
 
+	property_back->set_disabled( editor_history.is_at_begining() );
+	property_forward->set_disabled( editor_history.is_at_end() );
+
 	this->current=current_obj;
 	editor_path->update_path();
 
@@ -1416,7 +1550,10 @@ void EditorNode::_edit_current() {
 
 	object_menu->set_disabled(true);
 
-	if (current_obj->is_type("Resource")) {
+	bool is_resource = current_obj->is_type("Resource");
+	resource_save_button->set_disabled(!is_resource);
+
+	if (is_resource) {
 
 
 		Resource *current_res = current_obj->cast_to<Resource>();
@@ -1425,12 +1562,11 @@ void EditorNode::_edit_current() {
 		property_editor->edit( current_res );
 		object_menu->set_disabled(false);
 
-		resources_dock->add_resource(Ref<Resource>(current_res));
+		//resources_dock->add_resource(Ref<Resource>(current_res));
+
+
 		//top_pallete->set_current_tab(1);
-	}
-
-
-	if (current_obj->is_type("Node")) {
+	} else if (current_obj->is_type("Node")) {
 
 		Node * current_node = current_obj->cast_to<Node>();
 		ERR_FAIL_COND(!current_node);
@@ -1445,6 +1581,12 @@ void EditorNode::_edit_current() {
 
 		//top_pallete->set_current_tab(0);
 
+	} else {
+
+		property_editor->edit( current_obj );
+		//scene_tree_dock->set_selected(current_node);
+		//object_menu->get_popup()->clear();
+
 	}
 
 	/* Take care of PLUGIN EDITOR */
@@ -1517,7 +1659,13 @@ void EditorNode::_edit_current() {
 	p->add_item("Copy Params",OBJECT_COPY_PARAMS);
 	p->add_item("Set Params",OBJECT_PASTE_PARAMS);
 	p->add_separator();
-	p->add_item("Make Resources Unique",OBJECT_UNIQUE_RESOURCES);
+	p->add_item("Paste Resource",RESOURCE_PASTE);
+	if (is_resource) {
+		p->add_item("Copy Resource",RESOURCE_COPY);
+		p->add_item("Make Built-In",RESOURCE_UNREF);
+	}
+	p->add_separator();
+	p->add_item("Make Sub-Resources Unique",OBJECT_UNIQUE_RESOURCES);
 	p->add_separator();
 	p->add_icon_item(gui_base->get_icon("Help","EditorIcons"),"Class Reference",OBJECT_REQUEST_HELP);
 	List<MethodInfo> methods;
@@ -1550,6 +1698,20 @@ void EditorNode::_edit_current() {
 	_update_keying();
 }
 
+void EditorNode::_resource_created() {
+
+	Object *c = create_dialog->instance_selected();
+
+	ERR_FAIL_COND(!c);
+	Resource *r = c->cast_to<Resource>();
+	ERR_FAIL_COND(!r);
+
+	REF res( r );
+
+	push_item(c);
+
+}
+
 void EditorNode::_resource_selected(const RES& p_res,const String& p_property) {
 	
 
@@ -1762,6 +1924,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 
 			int idx = editor_data.add_edited_scene(-1);
 			_scene_tab_changed(idx);
+			editor_data.clear_editor_states();
 
 			//_cleanup_scene();
 
@@ -1803,6 +1966,13 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 			quick_open->popup("Script");
 			quick_open->set_title("Quick Open Script..");
 
+		} break;
+		case FILE_QUICK_OPEN_FILE: {
+
+
+			quick_open->popup("Resource",false,true);
+			quick_open->set_title("Quick Search File..");
+
 		} break;
 		case FILE_RUN_SCRIPT: {
 
@@ -2266,7 +2436,70 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 
 		} break;
 #endif
-		
+		case RESOURCE_NEW: {
+
+			create_dialog->popup_centered_ratio();
+		} break;
+		case RESOURCE_LOAD: {
+
+			open_resource();
+		} break;
+		case RESOURCE_SAVE: {
+
+
+			uint32_t current = editor_history.get_current();
+			Object *current_obj = current>0 ? ObjectDB::get_instance(current) : NULL;
+
+			ERR_FAIL_COND(!current_obj->cast_to<Resource>())
+
+			RES current_res = RES(current_obj->cast_to<Resource>());
+
+			save_resource(current_res);
+
+		} break;
+		case RESOURCE_SAVE_AS: {
+
+			uint32_t current = editor_history.get_current();
+			Object *current_obj = current>0 ? ObjectDB::get_instance(current) : NULL;
+
+			ERR_FAIL_COND(!current_obj->cast_to<Resource>())
+
+			RES current_res = RES(current_obj->cast_to<Resource>());
+
+			save_resource_as(current_res);
+
+		} break;
+		case RESOURCE_UNREF: {
+
+			uint32_t current = editor_history.get_current();
+			Object *current_obj = current>0 ? ObjectDB::get_instance(current) : NULL;
+
+			ERR_FAIL_COND(!current_obj->cast_to<Resource>())
+
+			RES current_res = RES(current_obj->cast_to<Resource>());
+			current_res->set_path("");
+			_edit_current();
+		} break;
+		case RESOURCE_COPY: {
+
+			uint32_t current = editor_history.get_current();
+			Object *current_obj = current>0 ? ObjectDB::get_instance(current) : NULL;
+
+			ERR_FAIL_COND(!current_obj->cast_to<Resource>())
+
+			RES current_res = RES(current_obj->cast_to<Resource>());
+
+			EditorSettings::get_singleton()->set_resource_clipboard(current_res);
+
+		} break;
+		case RESOURCE_PASTE: {
+
+			RES r = EditorSettings::get_singleton()->get_resource_clipboard();
+			if (r.is_valid()) {
+				push_item(EditorSettings::get_singleton()->get_resource_clipboard().ptr(),String());
+			}
+
+		} break;
 		case OBJECT_REQUEST_HELP: {
 
 			if (current) {
@@ -3050,7 +3283,21 @@ void EditorNode::set_current_scene(int p_idx) {
 
 }
 
-Error EditorNode::load_scene(const String& p_scene) {
+bool EditorNode::is_scene_open(const String& p_path) {
+
+	for(int i=0;i<editor_data.get_edited_scene_count();i++) {
+		if (editor_data.get_scene_path(i)==p_path)
+			return true;
+	}
+
+	return false;
+}
+
+void EditorNode::fix_dependencies(const String& p_for_file) {
+	dependency_fixer->edit(p_for_file);
+}
+
+Error EditorNode::load_scene(const String& p_scene, bool p_ignore_broken_deps) {
 
 	if (!is_inside_tree()) {
 		defer_load_scene = p_scene;
@@ -3096,6 +3343,8 @@ Error EditorNode::load_scene(const String& p_scene) {
 
 	//_cleanup_scene(); // i'm sorry but this MUST happen to avoid modified resources to not be reloaded.
 
+	dependency_errors.clear();
+
 	Ref<PackedScene> sdata = ResourceLoader::load(lpath,"",true);
 	if (!sdata.is_valid()) {
 
@@ -3113,6 +3362,35 @@ Error EditorNode::load_scene(const String& p_scene) {
 		return ERR_FILE_NOT_FOUND;
 	}
 
+	if (!p_ignore_broken_deps && dependency_errors.has(lpath)) {
+
+		current_option=-1;
+		Vector<String> errors;
+		for(Set<String>::Element *E=dependency_errors[lpath].front();E;E=E->next()) {
+
+			errors.push_back(E->get());
+		}
+		dependency_error->show(lpath,errors);
+		opening_prev=false;
+
+		if (prev!=-1) {
+			set_current_scene(prev);
+			editor_data.remove_scene(idx);
+		}
+		return ERR_FILE_MISSING_DEPENDENCIES;
+	}
+
+	dependency_errors.erase(lpath); //at least not self path
+
+	for (Map<String,Set<String> >::Element *E=dependency_errors.front();E;E=E->next()) {
+
+		String txt="Scene '"+E->key()+"' has broken dependencies:\n";
+		for(Set<String>::Element *F=E->get().front();F;F=F->next()) {
+			txt+="\t"+F->get()+"\n";
+		}
+		add_io_error(txt);
+	}
+
 	sdata->set_path(lpath,true); //take over path
 
 	Node*new_scene=sdata->instance(true);
@@ -3408,9 +3686,12 @@ void EditorNode::hide_animation_player_editors() {
 
 void EditorNode::_quick_opened(const String& p_resource) {
 
-	print_line("quick_opened");
-	if (quick_open->get_base_type()=="PackedScene") {
+	if (current_option==FILE_QUICK_OPEN_FILE) {
+		scenes_dock->open(p_resource);
+		return;
+	}
 
+	if (quick_open->get_base_type()=="PackedScene") {
 		open_request(p_resource);
 	} else {
 		load_resource(p_resource);
@@ -3595,6 +3876,8 @@ void EditorNode::_bind_methods() {
 	ObjectTypeDB::bind_method("_quick_opened",&EditorNode::_quick_opened);
 	ObjectTypeDB::bind_method("_quick_run",&EditorNode::_quick_run);
 
+	ObjectTypeDB::bind_method("_resource_created",&EditorNode::_resource_created);
+
 	ObjectTypeDB::bind_method("_import_action",&EditorNode::_import_action);
 	//ObjectTypeDB::bind_method("_import",&EditorNode::_import);
 //	ObjectTypeDB::bind_method("_import_conflicts_solved",&EditorNode::_import_conflicts_solved);
@@ -3624,6 +3907,8 @@ void EditorNode::_bind_methods() {
 	ObjectTypeDB::bind_method("_set_main_scene_state",&EditorNode::_set_main_scene_state);
 	ObjectTypeDB::bind_method("_update_scene_tabs",&EditorNode::_update_scene_tabs);
 
+	ObjectTypeDB::bind_method("_prepare_history",&EditorNode::_prepare_history);
+	ObjectTypeDB::bind_method("_select_history",&EditorNode::_select_history);
 
 
 	ObjectTypeDB::bind_method(_MD("add_editor_import_plugin", "plugin"), &EditorNode::add_editor_import_plugin);
@@ -4105,6 +4390,14 @@ EditorNode::EditorNode() {
 
 	EditorHelp::generate_doc(); //before any editor classes are crated
 
+	if (!OS::get_singleton()->has_touchscreen_ui_hint() && Input::get_singleton()) {
+		//only if no touchscreen ui hint, set emulation
+		InputDefault *id = Input::get_singleton()->cast_to<InputDefault>();
+		if (id)
+			id->set_emulate_touch(false); //just disable just in case
+	}
+
+
 	singleton=this;
 	last_checked_version=0;
 	changing_scene=false;
@@ -4120,6 +4413,7 @@ EditorNode::EditorNode() {
 	ResourceLoader::set_abort_on_missing_resources(false);
 	FileDialog::set_default_show_hidden_files(EditorSettings::get_singleton()->get("file_dialog/show_hidden_files"));
 	ResourceLoader::set_error_notify_func(this,_load_error_notify);
+	ResourceLoader::set_dependency_error_notify_func(this,_dependency_error_report);
 
 	ResourceLoader::set_timestamp_on_load(true);
 	ResourceSaver::set_timestamp_on_save(true);
@@ -4493,6 +4787,7 @@ EditorNode::EditorNode() {
 	p->add_separator();
 	p->add_item("Quick Open Scene..",FILE_QUICK_OPEN_SCENE,KEY_MASK_SHIFT+KEY_MASK_CMD+KEY_O);
 	p->add_item("Quick Open Script..",FILE_QUICK_OPEN_SCRIPT,KEY_MASK_ALT+KEY_MASK_CMD+KEY_O);
+	p->add_item("Quick Search File..",FILE_QUICK_OPEN_FILE,KEY_MASK_ALT+KEY_MASK_CMD+KEY_P);
 	p->add_separator();
 
 	PopupMenu *pm_export = memnew(PopupMenu );
@@ -4735,13 +5030,14 @@ EditorNode::EditorNode() {
 	scene_tree_dock->set_name("Scene");
 	//top_pallete->add_child(scene_tree_dock);
 	dock_slot[DOCK_SLOT_LEFT_UR]->add_child(scene_tree_dock);
-
+#if 0
 	resources_dock = memnew( ResourcesDock(this) );
 	resources_dock->set_name("Resources");
 	//top_pallete->add_child(resources_dock);
 	dock_slot[DOCK_SLOT_RIGHT_BL]->add_child(resources_dock);
 	//top_pallete->set_v_size_flags(Control::SIZE_EXPAND_FILL);
-
+#endif
+	dock_slot[DOCK_SLOT_RIGHT_BL]->hide();
 	/*Control *editor_spacer = memnew( Control );
 	editor_spacer->set_custom_minimum_size(Size2(260,200));
 	editor_spacer->set_v_size_flags(Control::SIZE_EXPAND_FILL);
@@ -4766,27 +5062,40 @@ EditorNode::EditorNode() {
 	dock_slot[DOCK_SLOT_RIGHT_UL]->add_child(prop_editor_base);
 
 	HBoxContainer *prop_editor_hb = memnew( HBoxContainer );
+
 	prop_editor_base->add_child(prop_editor_hb);
-	editor_path = memnew( EditorPath(&editor_history) );
-	editor_path->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-	prop_editor_hb->add_child(editor_path);
 
-	property_editor = memnew( PropertyEditor );
-	property_editor->set_autoclear(true);
-	property_editor->set_show_categories(true);
-	property_editor->set_v_size_flags(Control::SIZE_EXPAND_FILL);
-	
-	property_editor->hide_top_label();
+	resource_new_button = memnew( ToolButton );
+	resource_new_button->set_tooltip("Create a new resource in memory and edit it");
+	resource_new_button->set_icon(gui_base->get_icon("New","EditorIcons"));
+	prop_editor_hb->add_child(resource_new_button);
+	resource_new_button->connect("pressed",this,"_menu_option",varray(RESOURCE_NEW));
+	resource_new_button->set_focus_mode(Control::FOCUS_NONE);
 
-	prop_editor_base->add_child( property_editor );
-	property_editor->set_undo_redo(&editor_data.get_undo_redo());
+	resource_load_button = memnew( ToolButton );
+	resource_load_button->set_tooltip("Load an existing resource from disk and edit it");
+	resource_load_button->set_icon(gui_base->get_icon("Load","EditorIcons"));
+	prop_editor_hb->add_child(resource_load_button);
+	resource_load_button->connect("pressed",this,"_menu_option",varray(RESOURCE_LOAD));
+	resource_load_button->set_focus_mode(Control::FOCUS_NONE);
 
+	resource_save_button = memnew( MenuButton );
+	resource_save_button->set_tooltip("Save the currently edited resource");
+	resource_save_button->set_icon(gui_base->get_icon("Save","EditorIcons"));
+	prop_editor_hb->add_child(resource_save_button);
+	resource_save_button->get_popup()->add_item("Save",RESOURCE_SAVE);
+	resource_save_button->get_popup()->add_item("Save As..",RESOURCE_SAVE_AS);
+	resource_save_button->get_popup()->connect("item_pressed",this,"_menu_option");
+	resource_save_button->set_focus_mode(Control::FOCUS_NONE);
+	resource_save_button->set_disabled(true);
+
+	prop_editor_hb->add_spacer();
 
-	
 	property_back = memnew( ToolButton );
 	property_back->set_icon( gui_base->get_icon("Back","EditorIcons") );
 	property_back->set_flat(true);
 	property_back->set_tooltip("Go to the previous edited object in history.");
+	property_back->set_disabled(true);
 
 	prop_editor_hb->add_child( property_back );
 
@@ -4794,14 +5103,48 @@ EditorNode::EditorNode() {
 	property_forward->set_icon( gui_base->get_icon("Forward","EditorIcons") );
 	property_forward->set_flat(true);
 	property_forward->set_tooltip("Go to the next edited object in history.");
+	property_forward->set_disabled(true);
 
 	prop_editor_hb->add_child( property_forward );
 
+
+	editor_history_menu = memnew( MenuButton );
+	editor_history_menu->set_icon( gui_base->get_icon("History","EditorIcons"));
+	prop_editor_hb->add_child(editor_history_menu);
+	editor_history_menu->connect("about_to_show",this,"_prepare_history");
+	editor_history_menu->get_popup()->connect("item_pressed",this,"_select_history");
+
+
+	prop_editor_hb = memnew( HBoxContainer ); //again...
+
+	prop_editor_base->add_child(prop_editor_hb);
+	editor_path = memnew( EditorPath(&editor_history) );
+	editor_path->set_h_size_flags(Control::SIZE_EXPAND_FILL);
+	prop_editor_hb->add_child(editor_path);
+
+
 	object_menu = memnew( MenuButton );
 	object_menu->set_icon(gui_base->get_icon("Tools","EditorIcons"));
 	prop_editor_hb->add_child( object_menu );
 	object_menu->set_tooltip("Object properties.");
 
+	create_dialog = memnew( CreateDialog );
+	gui_base->add_child(create_dialog);
+	create_dialog->set_base_type("Resource");
+	create_dialog->connect("create",this,"_resource_created");
+
+
+	property_editor = memnew( PropertyEditor );
+	property_editor->set_autoclear(true);
+	property_editor->set_show_categories(true);
+	property_editor->set_v_size_flags(Control::SIZE_EXPAND_FILL);
+	property_editor->set_use_doc_hints(true);
+
+	property_editor->hide_top_label();
+
+	prop_editor_base->add_child( property_editor );
+	property_editor->set_undo_redo(&editor_data.get_undo_redo());
+
 
 	scenes_dock = memnew( ScenesDock(this) );
 	scenes_dock->set_name("FileSystem");
@@ -4929,7 +5272,11 @@ EditorNode::EditorNode() {
 
 
 
+	dependency_error = memnew( DependencyErrorDialog );
+	gui_base->add_child(dependency_error);
 
+	dependency_fixer = memnew( DependencyEditor );
+	gui_base->add_child( dependency_fixer );
 	
 	settings_config_dialog = memnew( EditorSettingsDialog );
 	gui_base->add_child(settings_config_dialog);
diff --git a/tools/editor/editor_node.h b/tools/editor/editor_node.h
index d40658a0565..dba2b7b86c1 100644
--- a/tools/editor/editor_node.h
+++ b/tools/editor/editor_node.h
@@ -123,6 +123,7 @@ class EditorNode : public Node {
 		FILE_OPEN_OLD_SCENE,
 		FILE_QUICK_OPEN_SCENE,
 		FILE_QUICK_OPEN_SCRIPT,
+		FILE_QUICK_OPEN_FILE,
 		FILE_RUN_SCRIPT,
 		FILE_OPEN_PREV,
 		FILE_CLOSE,
@@ -137,6 +138,7 @@ class EditorNode : public Node {
 		RESOURCE_SAVE_AS,
 		RESOURCE_UNREF,
 		RESOURCE_COPY,
+		RESOURCE_PASTE,
 		OBJECT_COPY_PARAMS,
 		OBJECT_PASTE_PARAMS,
 		OBJECT_UNIQUE_RESOURCES,
@@ -256,11 +258,13 @@ class EditorNode : public Node {
 	Button *property_back;
 	Button *property_forward;
 	SceneTreeDock *scene_tree_dock;
-	ResourcesDock *resources_dock;
+	//ResourcesDock *resources_dock;
 	PropertyEditor *property_editor;
 	ScenesDock *scenes_dock;
 	EditorRunNative *run_native;
 
+	CreateDialog *create_dialog;
+
 	CallDialog *call_dialog;
 	ConfirmationDialog *confirmation;
 	ConfirmationDialog *import_confirmation;
@@ -298,6 +302,10 @@ class EditorNode : public Node {
 	HBoxContainer *animation_panel_hb;
 	VBoxContainer *animation_vb;
 	EditorPath *editor_path;
+	ToolButton *resource_new_button;
+	ToolButton *resource_load_button;
+	MenuButton *resource_save_button;
+	MenuButton *editor_history_menu;
 	AnimationKeyEditor *animation_editor;
 	EditorLog *log;
 	CenterContainer *tabs_center;
@@ -312,6 +320,9 @@ class EditorNode : public Node {
 	ProgressDialog *progress_dialog;
 	BackgroundProgress *progress_hb;
 
+	DependencyErrorDialog *dependency_error;
+	DependencyEditor *dependency_fixer;
+
 	TabContainer *dock_slot[DOCK_SLOT_MAX];
 	Rect2 dock_select_rect[DOCK_SLOT_MAX];
 	int dock_select_rect_over;
@@ -367,6 +378,7 @@ class EditorNode : public Node {
 	
 	int current_option;
 	//void _animation_visibility_toggle();
+	void _resource_created();
 	void _resource_selected(const RES& p_res,const String& p_property="");
 	void _menu_option(int p_option);
 	void _menu_confirm_current();
@@ -375,6 +387,9 @@ class EditorNode : public Node {
 	void _property_editor_forward();
 	void _property_editor_back();
 
+	void _select_history(int p_idx);
+	void _prepare_history();
+
 	
 	void _fs_changed();
 	void _sources_changed(bool p_exist);
@@ -451,6 +466,16 @@ class EditorNode : public Node {
 	void _save_scene_with_preview(String p_file);
 
 
+	Map<String,Set<String> > dependency_errors;
+
+	static void _dependency_error_report(void *ud,const String& p_path,const String& p_dep,const String& p_type) {
+		EditorNode*en=(EditorNode*)ud;
+		if (!en->dependency_errors.has(p_path))
+			en->dependency_errors[p_path]=Set<String>();
+		en->dependency_errors[p_path].insert(p_dep+"::"+p_type);
+
+	}
+
 	struct ExportDefer {
 		String platform;
 		String path;
@@ -503,6 +528,8 @@ public:
 	void edit_node(Node *p_node);
 	void edit_resource(const Ref<Resource>& p_resource);
 	void open_resource(const String& p_type="");
+
+	void save_resource_in_path(const Ref<Resource>& p_resource,const String& p_path);
 	void save_resource(const Ref<Resource>& p_resource);
 	void save_resource_as(const Ref<Resource>& p_resource);
 
@@ -534,10 +561,13 @@ public:
 	Viewport *get_scene_root() { return scene_root; } //root of the scene being edited
 	Error save_optimized_copy(const String& p_scene,const String& p_preset);
 
+	void fix_dependencies(const String& p_for_file);
 	void clear_scene() { _cleanup_scene(); }
-	Error load_scene(const String& p_scene);
+	Error load_scene(const String& p_scene,bool p_ignore_broken_deps=false);
 	Error load_resource(const String& p_scene);
 
+	bool is_scene_open(const String& p_path);
+
 	void set_current_version(uint64_t p_version);
 	void set_current_scene(int p_idx);
 
diff --git a/tools/editor/editor_path.cpp b/tools/editor/editor_path.cpp
index 86fd79d014f..94e2efe346c 100644
--- a/tools/editor/editor_path.cpp
+++ b/tools/editor/editor_path.cpp
@@ -73,7 +73,11 @@ void EditorPath::_notification(int p_what) {
 					if (obj->cast_to<Resource>()) {
 
 						Resource *r = obj->cast_to<Resource>();
-						name=r->get_name();
+						if (r->get_path().is_resource_file())
+							name=r->get_path().get_file();
+						else
+							name=r->get_name();
+
 						if (name=="")
 							name=r->get_type();
 					} else if (obj->cast_to<Node>()) {
diff --git a/tools/editor/editor_run.cpp b/tools/editor/editor_run.cpp
index 77c5f419b1a..4d07463b21e 100644
--- a/tools/editor/editor_run.cpp
+++ b/tools/editor/editor_run.cpp
@@ -28,7 +28,7 @@
 /*************************************************************************/
 #include "editor_run.h"
 #include "globals.h"
-
+#include "editor_settings.h"
 
 EditorRun::Status EditorRun::get_status() const {
 
@@ -61,6 +61,70 @@ Error EditorRun::run(const String& p_scene,const String p_custom_args,const List
 		}
 	}
 
+
+	int screen = EditorSettings::get_singleton()->get("game_window_placement/screen");
+
+	if (screen==0) {
+		screen=OS::get_singleton()->get_current_screen();
+	} else {
+		screen--;
+	}
+
+	Rect2 screen_rect;
+	screen_rect.pos=OS::get_singleton()->get_screen_position(screen);
+	screen_rect.size=OS::get_singleton()->get_screen_size(screen);
+
+
+	Size2 desired_size;
+
+	desired_size.x=Globals::get_singleton()->get("display/width");
+	desired_size.y=Globals::get_singleton()->get("display/height");
+
+	Size2 test_size;
+	test_size.x=Globals::get_singleton()->get("display/test_width");
+	test_size.y=Globals::get_singleton()->get("display/test_height");
+	if (test_size.x>0 && test_size.y>0) {
+
+		desired_size=test_size;
+	}
+
+
+	int window_placement=EditorSettings::get_singleton()->get("game_window_placement/rect");
+
+	switch(window_placement) {
+		case 0: { // default
+
+			args.push_back("-p");
+			args.push_back(itos(screen_rect.pos.x)+"x"+itos(screen_rect.pos.y));
+		} break;
+		case 1: { // centered
+			Vector2 pos=screen_rect.pos+((screen_rect.size-desired_size)/2).floor();
+			args.push_back("-p");
+			args.push_back(itos(pos.x)+"x"+itos(pos.y));
+		} break;
+		case 2: { // custom pos
+			Vector2 pos = EditorSettings::get_singleton()->get("game_window_placement/rect_custom_position");
+			pos+=screen_rect.pos;
+			args.push_back("-p");
+			args.push_back(itos(pos.x)+"x"+itos(pos.y));
+		} break;
+		case 3: { // force maximized
+			Vector2 pos=screen_rect.pos;
+			args.push_back("-p");
+			args.push_back(itos(pos.x)+"x"+itos(pos.y));
+			args.push_back("-mx");
+
+		} break;
+		case 4: { // force fullscreen
+
+			Vector2 pos=screen_rect.pos;
+			args.push_back("-p");
+			args.push_back(itos(pos.x)+"x"+itos(pos.y));
+			args.push_back("-f");
+		} break;
+	}
+
+
 	if (p_breakpoints.size()) {
 
 		args.push_back("-bp");
diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp
index 2f61d4f09d2..a771893bdd1 100644
--- a/tools/editor/editor_settings.cpp
+++ b/tools/editor/editor_settings.cpp
@@ -496,6 +496,15 @@ void EditorSettings::_load_defaults() {
 	set("2d_editor/bone_selected_color",Color(0.9,0.45,0.45,0.9));
 	set("2d_editor/bone_ik_color",Color(0.9,0.9,0.45,0.9));
 
+	set("game_window_placement/rect",0);
+	hints["game_window_placement/rect"]=PropertyInfo(Variant::INT,"game_window_placement/rect",PROPERTY_HINT_ENUM,"Default,Centered,Custom Position,Force Maximized,Force Full Screen");
+	String screen_hints="Default (Same as Editor)";
+	for(int i=0;i<OS::get_singleton()->get_screen_count();i++) {
+		screen_hints+=",Monitor "+itos(i+1);
+	}
+	set("game_window_placement/rect_custom_position",Vector2());
+	set("game_window_placement/screen",0);
+	hints["game_window_placement/screen"]=PropertyInfo(Variant::INT,"game_window_placement/screen",PROPERTY_HINT_ENUM,screen_hints);
 
 	set("on_save/compress_binary_resources",true);
 	set("on_save/save_modified_external_resources",true);
diff --git a/tools/editor/icons/icon_anchor.png b/tools/editor/icons/icon_anchor.png
new file mode 100644
index 00000000000..1f9f9fa1396
Binary files /dev/null and b/tools/editor/icons/icon_anchor.png differ
diff --git a/tools/editor/icons/icon_control_align_bottom_center.png b/tools/editor/icons/icon_control_align_bottom_center.png
new file mode 100644
index 00000000000..5ce9fe5c1c1
Binary files /dev/null and b/tools/editor/icons/icon_control_align_bottom_center.png differ
diff --git a/tools/editor/icons/icon_control_align_bottom_left.png b/tools/editor/icons/icon_control_align_bottom_left.png
new file mode 100644
index 00000000000..6c5129bf95f
Binary files /dev/null and b/tools/editor/icons/icon_control_align_bottom_left.png differ
diff --git a/tools/editor/icons/icon_control_align_bottom_right.png b/tools/editor/icons/icon_control_align_bottom_right.png
new file mode 100644
index 00000000000..8857f4e9404
Binary files /dev/null and b/tools/editor/icons/icon_control_align_bottom_right.png differ
diff --git a/tools/editor/icons/icon_control_align_bottom_wide.png b/tools/editor/icons/icon_control_align_bottom_wide.png
new file mode 100644
index 00000000000..56f009b8e45
Binary files /dev/null and b/tools/editor/icons/icon_control_align_bottom_wide.png differ
diff --git a/tools/editor/icons/icon_control_align_center.png b/tools/editor/icons/icon_control_align_center.png
new file mode 100644
index 00000000000..acd42525faa
Binary files /dev/null and b/tools/editor/icons/icon_control_align_center.png differ
diff --git a/tools/editor/icons/icon_control_align_center_left.png b/tools/editor/icons/icon_control_align_center_left.png
new file mode 100644
index 00000000000..997074b0974
Binary files /dev/null and b/tools/editor/icons/icon_control_align_center_left.png differ
diff --git a/tools/editor/icons/icon_control_align_center_right.png b/tools/editor/icons/icon_control_align_center_right.png
new file mode 100644
index 00000000000..b5cae63f7a0
Binary files /dev/null and b/tools/editor/icons/icon_control_align_center_right.png differ
diff --git a/tools/editor/icons/icon_control_align_left_center.png b/tools/editor/icons/icon_control_align_left_center.png
new file mode 100644
index 00000000000..7bb4dfb5673
Binary files /dev/null and b/tools/editor/icons/icon_control_align_left_center.png differ
diff --git a/tools/editor/icons/icon_control_align_left_wide.png b/tools/editor/icons/icon_control_align_left_wide.png
new file mode 100644
index 00000000000..1b0a6cff958
Binary files /dev/null and b/tools/editor/icons/icon_control_align_left_wide.png differ
diff --git a/tools/editor/icons/icon_control_align_right_center.png b/tools/editor/icons/icon_control_align_right_center.png
new file mode 100644
index 00000000000..cf12d44c6a9
Binary files /dev/null and b/tools/editor/icons/icon_control_align_right_center.png differ
diff --git a/tools/editor/icons/icon_control_align_right_wide.png b/tools/editor/icons/icon_control_align_right_wide.png
new file mode 100644
index 00000000000..406ed25aed3
Binary files /dev/null and b/tools/editor/icons/icon_control_align_right_wide.png differ
diff --git a/tools/editor/icons/icon_control_align_top_center.png b/tools/editor/icons/icon_control_align_top_center.png
new file mode 100644
index 00000000000..da7ede984a1
Binary files /dev/null and b/tools/editor/icons/icon_control_align_top_center.png differ
diff --git a/tools/editor/icons/icon_control_align_top_left.png b/tools/editor/icons/icon_control_align_top_left.png
new file mode 100644
index 00000000000..84a224fbbe2
Binary files /dev/null and b/tools/editor/icons/icon_control_align_top_left.png differ
diff --git a/tools/editor/icons/icon_control_align_top_right.png b/tools/editor/icons/icon_control_align_top_right.png
new file mode 100644
index 00000000000..3b58eead9c4
Binary files /dev/null and b/tools/editor/icons/icon_control_align_top_right.png differ
diff --git a/tools/editor/icons/icon_control_align_top_wide.png b/tools/editor/icons/icon_control_align_top_wide.png
new file mode 100644
index 00000000000..869ae26134a
Binary files /dev/null and b/tools/editor/icons/icon_control_align_top_wide.png differ
diff --git a/tools/editor/icons/icon_control_align_wide.png b/tools/editor/icons/icon_control_align_wide.png
new file mode 100644
index 00000000000..57a2933b256
Binary files /dev/null and b/tools/editor/icons/icon_control_align_wide.png differ
diff --git a/tools/editor/icons/icon_control_hcenter_wide.png b/tools/editor/icons/icon_control_hcenter_wide.png
new file mode 100644
index 00000000000..739ea5baebd
Binary files /dev/null and b/tools/editor/icons/icon_control_hcenter_wide.png differ
diff --git a/tools/editor/icons/icon_control_vcenter_wide.png b/tools/editor/icons/icon_control_vcenter_wide.png
new file mode 100644
index 00000000000..44cbb8f3444
Binary files /dev/null and b/tools/editor/icons/icon_control_vcenter_wide.png differ
diff --git a/tools/editor/icons/icon_file_list.png b/tools/editor/icons/icon_file_list.png
index e5e9213e61f..ab790a85a57 100644
Binary files a/tools/editor/icons/icon_file_list.png and b/tools/editor/icons/icon_file_list.png differ
diff --git a/tools/editor/icons/icon_filesystem.png b/tools/editor/icons/icon_filesystem.png
new file mode 100644
index 00000000000..6841f9a792b
Binary files /dev/null and b/tools/editor/icons/icon_filesystem.png differ
diff --git a/tools/editor/icons/icon_history.png b/tools/editor/icons/icon_history.png
new file mode 100644
index 00000000000..5c306c3ac90
Binary files /dev/null and b/tools/editor/icons/icon_history.png differ
diff --git a/tools/editor/icons/icon_multi_node_edit.png b/tools/editor/icons/icon_multi_node_edit.png
new file mode 100644
index 00000000000..357c062cbd4
Binary files /dev/null and b/tools/editor/icons/icon_multi_node_edit.png differ
diff --git a/tools/editor/icons/icon_non_favorite.png b/tools/editor/icons/icon_non_favorite.png
new file mode 100644
index 00000000000..edd806fbe88
Binary files /dev/null and b/tools/editor/icons/icon_non_favorite.png differ
diff --git a/tools/editor/icons/icon_patch_9_frame.png b/tools/editor/icons/icon_patch_9_frame.png
new file mode 100644
index 00000000000..c8f38fa61af
Binary files /dev/null and b/tools/editor/icons/icon_patch_9_frame.png differ
diff --git a/tools/editor/inspector_dock.cpp b/tools/editor/inspector_dock.cpp
new file mode 100644
index 00000000000..57d19c3ec89
--- /dev/null
+++ b/tools/editor/inspector_dock.cpp
@@ -0,0 +1,22 @@
+#include "inspector_dock.h"
+
+#if 0
+void InspectorDock::_go_next() {
+
+
+}
+
+void InspectorDock::_go_prev() {
+
+
+}
+
+void InspectorDock::_bind_methods() {
+
+}
+
+InspectorDock::InspectorDock() {
+
+
+}
+#endif
diff --git a/tools/editor/inspector_dock.h b/tools/editor/inspector_dock.h
new file mode 100644
index 00000000000..90f043aba81
--- /dev/null
+++ b/tools/editor/inspector_dock.h
@@ -0,0 +1,35 @@
+#ifndef INSPECTOR_DOCK_H
+#define INSPECTOR_DOCK_H
+
+#include "scene/gui/box_container.h"
+#include "property_editor.h"
+
+
+//this is for now bundled in EditorNode, will be moved away here eventually
+
+#if 0
+class InspectorDock : public VBoxContainer
+{
+	OBJ_TYPE(InspectorDock,VBoxContainer);
+
+	PropertyEditor *property_editor;
+
+	EditorHistory editor_history;
+
+	void _go_next();
+	void _go_prev();
+
+protected:
+
+	static void _bind_methods();
+public:
+
+	EditorHistory &get_editor_history();
+
+	PropertyEditor *get_property_editor();
+
+	InspectorDock();
+};
+
+#endif
+#endif // INSPECTOR_DOCK_H
diff --git a/tools/editor/io_plugins/editor_import_collada.cpp b/tools/editor/io_plugins/editor_import_collada.cpp
index d510333a32c..d57cff850e7 100644
--- a/tools/editor/io_plugins/editor_import_collada.cpp
+++ b/tools/editor/io_plugins/editor_import_collada.cpp
@@ -710,10 +710,126 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize,Ref<Mesh>& p_mesh,con
 
 		//find largest source..
 
+		/************************/
+		/* ADD WEIGHTS IF EXIST */
+		/************************/
+
+		Map<int,Vector<Collada::Vertex::Weight> > pre_weights;
+
+		bool has_weights=false;
+
+		if (skin_controller) {
+
+			const Collada::SkinControllerData::Source *weight_src=NULL;
+			int weight_ofs=0;
+
+			if (skin_controller->weights.sources.has("WEIGHT")) {
+
+				String weight_id = skin_controller->weights.sources["WEIGHT"].source;
+				weight_ofs = skin_controller->weights.sources["WEIGHT"].offset;
+				if (skin_controller->sources.has(weight_id)) {
+
+					weight_src = &skin_controller->sources[weight_id];
+
+				}
+			}
+
+			int joint_ofs=0;
+
+			if (skin_controller->weights.sources.has("JOINT")) {
+
+				joint_ofs = skin_controller->weights.sources["JOINT"].offset;
+			}
+
+			//should be OK, given this was pre-checked.
+
+			int index_ofs=0;
+			int wstride = skin_controller->weights.sources.size();
+			for(int w_i=0;w_i<skin_controller->weights.sets.size();w_i++) {
+
+				int amount = skin_controller->weights.sets[w_i];
+
+				Vector<Collada::Vertex::Weight> weights;
+
+				for (int a_i=0;a_i<amount;a_i++) {
+
+					Collada::Vertex::Weight w;
+
+					int read_from = index_ofs+a_i*wstride;
+					ERR_FAIL_INDEX_V(read_from+wstride-1,skin_controller->weights.indices.size(),ERR_INVALID_DATA);
+					int weight_index = skin_controller->weights.indices[read_from+weight_ofs];
+					ERR_FAIL_INDEX_V(weight_index,weight_src->array.size(),ERR_INVALID_DATA);
+
+					w.weight = weight_src->array[weight_index];
+
+					int bone_index = skin_controller->weights.indices[read_from+joint_ofs];
+					if (bone_index==-1)
+						continue; //ignore this weight (refers to bind shape)
+					ERR_FAIL_INDEX_V(bone_index,bone_remap.size(),ERR_INVALID_DATA);
+
+					w.bone_idx=bone_remap[bone_index];
+
+
+					weights.push_back(w);
+				}
+
+				/* FIX WEIGHTS */
+
+
+
+				weights.sort();
+
+				if (weights.size()>4) {
+					//cap to 4 and make weights add up 1
+					weights.resize(4);
+
+				}
+
+				//make sure weights allways add up to 1
+				float total=0;
+				for(int i=0;i<weights.size();i++)
+					total+=weights[i].weight;
+				if (total)
+					for(int i=0;i<weights.size();i++)
+						weights[i].weight/=total;
+
+				if (weights.size()==0 || total==0) { //if nothing, add a weight to bone 0
+					//no weights assigned
+					Collada::Vertex::Weight w;
+					w.bone_idx=0;
+					w.weight=1.0;
+					weights.clear();
+					weights.push_back(w);
+
+				}
+
+				pre_weights[w_i]=weights;
+
+				/*
+				for(Set<int>::Element *E=vertex_map[w_i].front();E;E=E->next()) {
+
+					int dst = E->get();
+					ERR_EXPLAIN("invalid vertex index in array");
+					ERR_FAIL_INDEX_V(dst,vertex_array.size(),ERR_INVALID_DATA);
+					vertex_array[dst].weights=weights;
+
+				}*/
+
+
+
+
+				index_ofs+=wstride*amount;
+
+			}
+
+			//vertices need to be localized
+			has_weights=true;
+
+		}
 
 		Set<Collada::Vertex> vertex_set; //vertex set will be the vertices
 		List<int> indices_list; //indices will be the indices
-		Map<int,Set<int> > vertex_map; //map vertices (for setting skinning/morph)
+		//Map<int,Set<int> > vertex_map; //map vertices (for setting skinning/morph)
 
 		/**************************/
 		/* CREATE PRIMITIVE ARRAY */
@@ -753,11 +869,16 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize,Ref<Mesh>& p_mesh,con
 				if (!p_optimize)
 					vertex.uid=vertidx++;
 
+
+
 				int vertex_index=p.indices[src+vertex_ofs]; //used for index field (later used by controllers)
 				int vertex_pos = (vertex_src->stride?vertex_src->stride:3) * vertex_index;
 				ERR_FAIL_INDEX_V(vertex_pos,vertex_src->array.size(),ERR_INVALID_DATA);
 				vertex.vertex=Vector3(vertex_src->array[vertex_pos+0],vertex_src->array[vertex_pos+1],vertex_src->array[vertex_pos+2]);
 
+				if (pre_weights.has(vertex_index)) {
+					vertex.weights=pre_weights[vertex_index];
+				}
 
 				if (normal_src) {
 
@@ -836,9 +957,9 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize,Ref<Mesh>& p_mesh,con
 					vertex_set.insert(vertex);
 				}
 
-				if (!vertex_map.has(vertex_index))
+			/*	if (!vertex_map.has(vertex_index))
 					vertex_map[vertex_index]=Set<int>();
-				vertex_map[vertex_index].insert(index); //should be outside..
+				vertex_map[vertex_index].insert(index); //should be outside..*/
 				//build triangles if needed
 				if (j==0)
 					prev2[0]=index;
@@ -874,120 +995,10 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize,Ref<Mesh>& p_mesh,con
 			vertex_array[F->get().idx]=F->get();
 		}
 
-		/************************/
-		/* ADD WEIGHTS IF EXIST */
-		/************************/
 
+		if (has_weights) {
 
-		bool has_weights=false;
-
-		if (skin_controller) {
-
-			const Collada::SkinControllerData::Source *weight_src=NULL;
-			int weight_ofs=0;
-
-			if (skin_controller->weights.sources.has("WEIGHT")) {
-
-				String weight_id = skin_controller->weights.sources["WEIGHT"].source;
-				weight_ofs = skin_controller->weights.sources["WEIGHT"].offset;
-				if (skin_controller->sources.has(weight_id)) {
-
-					weight_src = &skin_controller->sources[weight_id];
-
-				}
-			}
-
-			int joint_ofs=0;
-
-			if (skin_controller->weights.sources.has("JOINT")) {
-
-				joint_ofs = skin_controller->weights.sources["JOINT"].offset;
-			}
-
-			//should be OK, given this was pre-checked.
-
-			int index_ofs=0;
-			int wstride = skin_controller->weights.sources.size();
-			for(int w_i=0;w_i<skin_controller->weights.sets.size();w_i++) {
-
-				int amount = skin_controller->weights.sets[w_i];
-
-				if (vertex_map.has(w_i)) { //vertex may no longer be here, don't bother converting
-
-					Vector<Collada::Vertex::Weight> weights;
-
-					for (int a_i=0;a_i<amount;a_i++) {
-
-						Collada::Vertex::Weight w;
-
-						int read_from = index_ofs+a_i*wstride;
-						ERR_FAIL_INDEX_V(read_from+wstride-1,skin_controller->weights.indices.size(),ERR_INVALID_DATA);
-						int weight_index = skin_controller->weights.indices[read_from+weight_ofs];
-						ERR_FAIL_INDEX_V(weight_index,weight_src->array.size(),ERR_INVALID_DATA);
-
-						w.weight = weight_src->array[weight_index];
-
-						int bone_index = skin_controller->weights.indices[read_from+joint_ofs];
-						if (bone_index==-1)
-							continue; //ignore this weight (refers to bind shape)
-						ERR_FAIL_INDEX_V(bone_index,bone_remap.size(),ERR_INVALID_DATA);
-
-						w.bone_idx=bone_remap[bone_index];
-
-
-						weights.push_back(w);
-					}
-
-					/* FIX WEIGHTS */
-
-
-
-					weights.sort();
-
-					if (weights.size()>4) {
-						//cap to 4 and make weights add up 1
-						weights.resize(4);
-
-					}
-
-					//make sure weights allways add up to 1
-					float total=0;
-					for(int i=0;i<weights.size();i++)
-						total+=weights[i].weight;
-					if (total)
-						for(int i=0;i<weights.size();i++)
-							weights[i].weight/=total;
-
-					if (weights.size()==0 || total==0) { //if nothing, add a weight to bone 0
-						//no weights assigned
-						Collada::Vertex::Weight w;
-						w.bone_idx=0;
-						w.weight=1.0;
-						weights.clear();
-						weights.push_back(w);
-
-					}
-
-
-					for(Set<int>::Element *E=vertex_map[w_i].front();E;E=E->next()) {
-
-						int dst = E->get();
-						ERR_EXPLAIN("invalid vertex index in array");
-						ERR_FAIL_INDEX_V(dst,vertex_array.size(),ERR_INVALID_DATA);
-						vertex_array[dst].weights=weights;
-
-					}
-
-				} else {
-					//zzprint_line("no vertex found for index "+itos(w_i));
-				}
-
-				index_ofs+=wstride*amount;
-
-			}
-
-			//vertices need to be localized
-
+			//if skeleton, localize
 			Transform local_xform = p_local_xform;
 			for(int i=0;i<vertex_array.size();i++) {
 
@@ -1000,11 +1011,9 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize,Ref<Mesh>& p_mesh,con
 					//vertex_array[i].tangent.normal*=-1.0;
 				}
 			}
-
-			has_weights=true;
-
 		}
 
+
 		DVector<int> index_array;
 		index_array.resize(indices_list.size());
 		DVector<int>::Write index_arrayw = index_array.write();
diff --git a/tools/editor/io_plugins/editor_texture_import_plugin.cpp b/tools/editor/io_plugins/editor_texture_import_plugin.cpp
index 4f7ec1839ab..436725f6fb1 100644
--- a/tools/editor/io_plugins/editor_texture_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_texture_import_plugin.cpp
@@ -1068,12 +1068,14 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc
 
 		//prepare atlas!
 		Vector< Image > sources;
+		Vector< Image > tsources;
 		bool alpha=false;
 		bool crop = from->get_option("crop");
 
 		EditorProgress ep("make_atlas","Build Atlas For: "+p_path.get_file(),from->get_source_count()+3);
 
 		print_line("sources: "+itos(from->get_source_count()));
+
 		for(int i=0;i<from->get_source_count();i++) {
 
 			String path = EditorImportPlugin::expand_source_path(from->get_source_path(i));
@@ -1091,17 +1093,57 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc
 			if (src.detect_alpha())
 				alpha=true;
 
-			sources.push_back(src);
+			tsources.push_back(src);
 		}
 		ep.step("Converting Images",sources.size());
 
-		for(int i=0;i<sources.size();i++) {
+		int base_index=0;
+
+
+		Map<uint64_t,int> source_md5;
+		Map<int,List<int> > source_map;
+
+		for(int i=0;i<tsources.size();i++) {
+
+			Image src = tsources[i];
 
 			if (alpha) {
-				sources[i].convert(Image::FORMAT_RGBA);
+				src.convert(Image::FORMAT_RGBA);
 			} else {
-				sources[i].convert(Image::FORMAT_RGB);
+				src.convert(Image::FORMAT_RGB);
 			}
+
+			DVector<uint8_t> data = src.get_data();
+			MD5_CTX md5;
+			DVector<uint8_t>::Read r=data.read();
+			MD5Init(&md5);
+			int len=data.size();
+			for(int j=0;j<len;j++) {
+				uint8_t b = r[j];
+				b>>=2; //to aid in comparing
+				MD5Update(&md5,(unsigned char*)&b,1);
+			}
+			MD5Final(&md5);
+			uint64_t *cmp = (uint64_t*)md5.digest; //less bits, but still useful for this
+
+			tsources[i]=Image(); //clear
+
+			if (source_md5.has(*cmp)) {
+				int sidx=source_md5[*cmp];
+				source_map[sidx].push_back(i);
+				print_line("REUSING "+from->get_source_path(i));
+
+			} else {
+				int sidx=sources.size();
+				source_md5[*cmp]=sidx;
+				sources.push_back(src);
+				List<int> sm;
+				sm.push_back(i);
+				source_map[sidx]=sm;
+
+			}
+
+
 		}
 
 		//texturepacker is not really good for optimizing, so..
@@ -1141,28 +1183,44 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc
 		Image atlas;
 		atlas.create(nearest_power_of_2(dst_size.width),nearest_power_of_2(dst_size.height),0,alpha?Image::FORMAT_RGBA:Image::FORMAT_RGB);
 
+
+		atlases.resize(from->get_source_count());
+
 		for(int i=0;i<sources.size();i++) {
 
 			int x=dst_positions[i].x;
 			int y=dst_positions[i].y;
 
-			Ref<AtlasTexture> at = memnew( AtlasTexture );
 			Size2 sz = Size2(sources[i].get_width(),sources[i].get_height());
+
+			Rect2 region;
+			Rect2 margin;
+
 			if (crop && sz!=crops[i].size) {
 				Rect2 rect = crops[i];
 				rect.size=sz-rect.size;
-				at->set_region(Rect2(x+border,y+border,crops[i].size.width,crops[i].size.height));
-				at->set_margin(rect);
+				region=Rect2(x+border,y+border,crops[i].size.width,crops[i].size.height);
+				margin=rect;
 				atlas.blit_rect(sources[i],crops[i],Point2(x+border,y+border));
 			} else {
-				at->set_region(Rect2(x+border,y+border,sz.x,sz.y));
+				region=Rect2(x+border,y+border,sz.x,sz.y);
 				atlas.blit_rect(sources[i],Rect2(0,0,sources[i].get_width(),sources[i].get_height()),Point2(x+border,y+border));
 			}
-			String apath = p_path.get_base_dir().plus_file(from->get_source_path(i).get_file().basename()+".atex");
-			print_line("Atlas Tex: "+apath);
-			at->set_path(apath);
-			atlases.push_back(at);
 
+			ERR_CONTINUE( !source_map.has(i) );
+			for (List<int>::Element *E=source_map[i].front();E;E=E->next()) {
+
+				Ref<AtlasTexture> at = memnew( AtlasTexture );
+
+
+				at->set_region(region);
+				at->set_margin(margin);
+				String apath = p_path.get_base_dir().plus_file(from->get_source_path(E->get()).get_file().basename()+".atex");
+				at->set_path(apath);
+				atlases[E->get()]=at;
+				print_line("Atlas Tex: "+apath);
+
+			}
 		}
 		if (ResourceCache::has(p_path)) {
 			texture = Ref<ImageTexture> ( ResourceCache::get(p_path)->cast_to<ImageTexture>() );
@@ -1414,6 +1472,9 @@ Vector<uint8_t> EditorTextureImportPlugin::custom_export(const String& p_path, c
 				case EditorImportExport::IMAGE_ACTION_COMPRESS_RAM: {
 					group_format=EditorTextureImportPlugin::IMAGE_FORMAT_COMPRESS_RAM;
 				} break; //use default
+				case EditorImportExport::IMAGE_ACTION_KEEP: {
+					return Vector<uint8_t>();
+				} break; //use default
 			}
 
 
diff --git a/tools/editor/multi_node_edit.cpp b/tools/editor/multi_node_edit.cpp
new file mode 100644
index 00000000000..cfa998bee9d
--- /dev/null
+++ b/tools/editor/multi_node_edit.cpp
@@ -0,0 +1,118 @@
+#include "multi_node_edit.h"
+#include "editor_node.h"
+
+bool MultiNodeEdit::_set(const StringName& p_name, const Variant& p_value){
+
+	Node *es = EditorNode::get_singleton()->get_edited_scene();
+	if (!es)
+		return false;
+
+	UndoRedo *ur=EditorNode::get_singleton()->get_undo_redo();
+
+	ur->create_action("MultiNode Set "+String(p_name));
+	for (const List<NodePath>::Element *E=nodes.front();E;E=E->next()) {
+
+		if (!es->has_node(E->get()))
+			continue;
+
+		Node*n=es->get_node(E->get());
+		if (!n)
+			continue;
+
+		ur->add_do_property(n,p_name,p_value);
+		ur->add_undo_property(n,p_name,n->get(p_name));
+
+	}
+
+	ur->commit_action();
+	return true;
+}
+
+bool MultiNodeEdit::_get(const StringName& p_name,Variant &r_ret) const {
+
+	Node *es = EditorNode::get_singleton()->get_edited_scene();
+	if (!es)
+		return false;
+
+	for (const List<NodePath>::Element *E=nodes.front();E;E=E->next()) {
+
+		if (!es->has_node(E->get()))
+			continue;
+
+		const Node*n=es->get_node(E->get());
+		if (!n)
+			continue;
+
+		bool found;
+		r_ret=n->get(p_name,&found);
+		if (found)
+			return true;
+
+	}
+
+	return false;
+}
+
+void MultiNodeEdit::_get_property_list( List<PropertyInfo> *p_list) const{
+
+	HashMap<String,PLData> usage;
+
+	Node *es = EditorNode::get_singleton()->get_edited_scene();
+	if (!es)
+		return;
+
+	int nc=0;
+
+	List<PLData*> datas;
+
+	for (const List<NodePath>::Element *E=nodes.front();E;E=E->next()) {
+
+		if (!es->has_node(E->get()))
+			continue;
+
+		Node*n=es->get_node(E->get());
+		if (!n)
+			continue;
+
+		List<PropertyInfo> plist;
+		n->get_property_list(&plist,true);
+
+		for(List<PropertyInfo>::Element *F=plist.front();F;F=F->next()) {
+
+			if (!usage.has(F->get().name)) {
+				PLData pld;
+				pld.uses=0;
+				pld.info=F->get();
+				usage[F->get().name]=pld;
+				datas.push_back(usage.getptr(F->get().name));
+			}
+
+			usage[F->get().name].uses++;
+		}
+
+		nc++;
+	}
+
+	for (List<PLData*>::Element *E=datas.front();E;E=E->next()) {
+
+		if (nc==E->get()->uses) {
+			p_list->push_back(E->get()->info);
+		}
+	}
+
+
+}
+
+void MultiNodeEdit::clear_nodes() {
+
+	nodes.clear();
+}
+
+void MultiNodeEdit::add_node(const NodePath& p_node){
+
+	nodes.push_back(p_node);
+}
+
+MultiNodeEdit::MultiNodeEdit()
+{
+}
diff --git a/tools/editor/multi_node_edit.h b/tools/editor/multi_node_edit.h
new file mode 100644
index 00000000000..5a0cabf4be7
--- /dev/null
+++ b/tools/editor/multi_node_edit.h
@@ -0,0 +1,32 @@
+#ifndef MULTI_NODE_EDIT_H
+#define MULTI_NODE_EDIT_H
+
+#include "scene/main/node.h"
+
+class MultiNodeEdit : public Reference {
+
+	OBJ_TYPE(MultiNodeEdit,Reference);
+
+	List<NodePath> nodes;
+	struct PLData {
+		int uses;
+		PropertyInfo info;
+	};
+
+protected:
+
+	bool _set(const StringName& p_name, const Variant& p_value);
+	bool _get(const StringName& p_name,Variant &r_ret) const;
+	void _get_property_list( List<PropertyInfo> *p_list) const;
+
+public:
+
+
+
+	void clear_nodes();
+	void add_node(const NodePath& p_node);
+
+	MultiNodeEdit();
+};
+
+#endif // MULTI_NODE_EDIT_H
diff --git a/tools/editor/plugins/animation_player_editor_plugin.cpp b/tools/editor/plugins/animation_player_editor_plugin.cpp
index 05b12543d2f..344e42c13b1 100644
--- a/tools/editor/plugins/animation_player_editor_plugin.cpp
+++ b/tools/editor/plugins/animation_player_editor_plugin.cpp
@@ -549,6 +549,49 @@ void AnimationPlayerEditor::ensure_visibility() {
 	_animation_edit();
 }
 
+Dictionary AnimationPlayerEditor::get_state() const {
+
+	Dictionary d;
+
+	d["visible"]=is_visible();
+	if (is_visible() && player) {
+		d["player"]=EditorNode::get_singleton()->get_edited_scene()->get_path_to(player);
+		d["animation"]=player->get_current_animation();
+		d["editing"]=edit_anim->is_pressed();
+	}
+
+	return d;
+
+}
+void AnimationPlayerEditor::set_state(const Dictionary& p_state) {
+
+	if (p_state.has("visible") && p_state["visible"]) {
+
+		Node *n = EditorNode::get_singleton()->get_edited_scene()->get_node(p_state["player"]);
+		if (n && n->cast_to<AnimationPlayer>()) {
+			player=n->cast_to<AnimationPlayer>();
+			_update_player();
+			show();
+			set_process(true);
+			ensure_visibility();
+			EditorNode::get_singleton()->animation_panel_make_visible(true);
+
+			if (p_state.has("animation")) {
+				String anim = p_state["animation"];
+				_select_anim_by_name(anim);
+				if (p_state.has("editing") && p_state["editing"]) {
+
+					edit_anim->set_pressed(true);
+					_animation_edit();
+				}
+			}
+
+		}
+	}
+
+}
+
+
 void AnimationPlayerEditor::_animation_resource_edit() {
 
 	if (animation->get_item_count()) {
diff --git a/tools/editor/plugins/animation_player_editor_plugin.h b/tools/editor/plugins/animation_player_editor_plugin.h
index 9f0413088d7..57057425658 100644
--- a/tools/editor/plugins/animation_player_editor_plugin.h
+++ b/tools/editor/plugins/animation_player_editor_plugin.h
@@ -151,6 +151,10 @@ protected:
 	static void _bind_methods();
 public:
 
+	Dictionary get_state() const;
+	void set_state(const Dictionary& p_state);
+
+
 	void ensure_visibility();
 
 	void set_undo_redo(UndoRedo *p_undo_redo) { undo_redo=p_undo_redo; }
@@ -167,6 +171,9 @@ class AnimationPlayerEditorPlugin : public EditorPlugin {
 
 public:
 
+	virtual Dictionary get_state() const { return anim_editor->get_state(); }
+	virtual void set_state(const Dictionary& p_state)  { anim_editor->set_state(p_state); }
+
 	virtual String get_name() const { return "Anim"; }
 	bool has_main_screen() const { return false; }
 	virtual void edit(Object *p_node);
diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp
index f2738f0a62c..8fc2945450a 100644
--- a/tools/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp
@@ -1910,12 +1910,20 @@ void CanvasItemEditor::_notification(int p_what) {
 
 		List<Node*> &selection = editor_selection->get_selected_node_list();
 
+		bool all_control=true;
+		bool has_control=false;
+
 		for(List<Node*>::Element *E=selection.front();E;E=E->next()) {
 
 			CanvasItem *canvas_item = E->get()->cast_to<CanvasItem>();
 			if (!canvas_item || !canvas_item->is_visible())
 				continue;
 
+			if (canvas_item->cast_to<Control>())
+				has_control=true;
+			else
+				all_control=false;
+
 			CanvasItemEditorSelectedItem *se=editor_selection->get_node_editor_data<CanvasItemEditorSelectedItem>(canvas_item);
 			if (!se)
 				continue;
@@ -1932,6 +1940,13 @@ void CanvasItemEditor::_notification(int p_what) {
 
 		}
 
+		bool show_anchor = all_control && has_control;
+		if (show_anchor != !anchor_menu->is_hidden()) {
+			if (show_anchor)
+				anchor_menu->show();
+			else
+				anchor_menu->hide();
+		}
 
 		for(Map<ObjectID,BoneList>::Element *E=bone_list.front();E;E=E->next()) {
 
@@ -1974,6 +1989,32 @@ void CanvasItemEditor::_notification(int p_what) {
 		ungroup_button->set_icon(get_icon("Ungroup","EditorIcons"));
 		key_insert_button->set_icon(get_icon("Key","EditorIcons"));
 
+
+		//anchor_menu->add_icon_override("Align Top Left");
+		anchor_menu->set_icon(get_icon("Anchor","EditorIcons"));
+		PopupMenu *p=anchor_menu->get_popup();
+
+		p->add_icon_item(get_icon("ControlAlignTopLeft","EditorIcons"),"Top Left",ANCHOR_ALIGN_TOP_LEFT);
+		p->add_icon_item(get_icon("ControlAlignTopRight","EditorIcons"),"Top Right",ANCHOR_ALIGN_TOP_RIGHT);
+		p->add_icon_item(get_icon("ControlAlignBottomRight","EditorIcons"),"Bottom Right",ANCHOR_ALIGN_BOTTOM_RIGHT);
+		p->add_icon_item(get_icon("ControlAlignBottomLeft","EditorIcons"),"Bottom Left",ANCHOR_ALIGN_BOTTOM_LEFT);
+		p->add_separator();
+		p->add_icon_item(get_icon("ControlAlignLeftCenter","EditorIcons"),"Center Left",ANCHOR_ALIGN_CENTER_LEFT);
+		p->add_icon_item(get_icon("ControlAlignTopCenter","EditorIcons"),"Center Top",ANCHOR_ALIGN_CENTER_TOP);
+		p->add_icon_item(get_icon("ControlAlignRightCenter","EditorIcons"),"Center Right",ANCHOR_ALIGN_CENTER_RIGHT);
+		p->add_icon_item(get_icon("ControlAlignBottomCenter","EditorIcons"),"Center Bottom",ANCHOR_ALIGN_CENTER_BOTTOM);
+		p->add_icon_item(get_icon("ControlAlignCenter","EditorIcons"),"Center",ANCHOR_ALIGN_CENTER);
+		p->add_separator();
+		p->add_icon_item(get_icon("ControlAlignLeftWide","EditorIcons"),"Left Wide",ANCHOR_ALIGN_LEFT_WIDE);
+		p->add_icon_item(get_icon("ControlAlignTopWide","EditorIcons"),"Top Wide",ANCHOR_ALIGN_TOP_WIDE);
+		p->add_icon_item(get_icon("ControlAlignRightWide","EditorIcons"),"Right Wide",ANCHOR_ALIGN_RIGHT_WIDE);
+		p->add_icon_item(get_icon("ControlAlignBottomWide","EditorIcons"),"Bottom Wide",ANCHOR_ALIGN_BOTTOM_WIDE);
+		p->add_icon_item(get_icon("ControlVcenterWide","EditorIcons"),"VCenter Wide ",ANCHOR_ALIGN_VCENTER_WIDE);
+		p->add_icon_item(get_icon("ControlHcenterWide","EditorIcons"),"HCenter Wide ",ANCHOR_ALIGN_HCENTER_WIDE);
+		p->add_separator();
+		p->add_icon_item(get_icon("ControlAlignWide","EditorIcons"),"Full Rect",ANCHOR_ALIGN_WIDE);
+
+
 	}
 
 	if (p_what==NOTIFICATION_READY) {
@@ -2179,6 +2220,27 @@ void CanvasItemEditor::_update_scroll(float) {
 
 }
 
+void CanvasItemEditor::_set_anchor(Control::AnchorType p_left,Control::AnchorType p_top,Control::AnchorType p_right,Control::AnchorType p_bottom) {
+	List<Node*> &selection = editor_selection->get_selected_node_list();
+
+	undo_redo->create_action("Change Anchors");
+	for(List<Node*>::Element *E=selection.front();E;E=E->next()) {
+
+		Control *c = E->get()->cast_to<Control>();
+
+		undo_redo->add_do_method(c,"set_anchor",MARGIN_LEFT,p_left);
+		undo_redo->add_do_method(c,"set_anchor",MARGIN_TOP,p_top);
+		undo_redo->add_do_method(c,"set_anchor",MARGIN_RIGHT,p_right);
+		undo_redo->add_do_method(c,"set_anchor",MARGIN_BOTTOM,p_bottom);
+		undo_redo->add_undo_method(c,"set_anchor",MARGIN_LEFT,c->get_anchor(MARGIN_LEFT));
+		undo_redo->add_undo_method(c,"set_anchor",MARGIN_TOP,c->get_anchor(MARGIN_TOP));
+		undo_redo->add_undo_method(c,"set_anchor",MARGIN_RIGHT,c->get_anchor(MARGIN_RIGHT));
+		undo_redo->add_undo_method(c,"set_anchor",MARGIN_BOTTOM,c->get_anchor(MARGIN_BOTTOM));
+	}
+
+	undo_redo->commit_action();
+
+}
 
 void CanvasItemEditor::_popup_callback(int p_op) {
 
@@ -2381,6 +2443,56 @@ void CanvasItemEditor::_popup_callback(int p_op) {
 		case SPACE_VERTICAL: {
 			//space_selected_items< proj_vector2_y, compare_items_y >();
 		} break;
+		case ANCHOR_ALIGN_TOP_LEFT: {
+			_set_anchor(ANCHOR_BEGIN,ANCHOR_BEGIN,ANCHOR_BEGIN,ANCHOR_BEGIN);
+		} break;
+		case ANCHOR_ALIGN_TOP_RIGHT: {
+			_set_anchor(ANCHOR_END,ANCHOR_BEGIN,ANCHOR_END,ANCHOR_BEGIN);
+		} break;
+		case ANCHOR_ALIGN_BOTTOM_LEFT: {
+			_set_anchor(ANCHOR_BEGIN,ANCHOR_END,ANCHOR_BEGIN,ANCHOR_END);
+		} break;
+		case ANCHOR_ALIGN_BOTTOM_RIGHT: {
+			_set_anchor(ANCHOR_END,ANCHOR_END,ANCHOR_END,ANCHOR_END);
+		} break;
+		case ANCHOR_ALIGN_CENTER_LEFT: {
+			_set_anchor(ANCHOR_BEGIN,ANCHOR_CENTER,ANCHOR_BEGIN,ANCHOR_CENTER);
+		} break;
+		case ANCHOR_ALIGN_CENTER_RIGHT: {
+
+			_set_anchor(ANCHOR_END,ANCHOR_CENTER,ANCHOR_END,ANCHOR_CENTER);
+		} break;
+		case ANCHOR_ALIGN_CENTER_TOP: {
+			_set_anchor(ANCHOR_CENTER,ANCHOR_BEGIN,ANCHOR_CENTER,ANCHOR_BEGIN);
+		} break;
+		case ANCHOR_ALIGN_CENTER_BOTTOM: {
+			_set_anchor(ANCHOR_CENTER,ANCHOR_END,ANCHOR_CENTER,ANCHOR_END);
+		} break;
+		case ANCHOR_ALIGN_CENTER: {
+			_set_anchor(ANCHOR_CENTER,ANCHOR_CENTER,ANCHOR_CENTER,ANCHOR_CENTER);
+		} break;
+		case ANCHOR_ALIGN_TOP_WIDE: {
+			_set_anchor(ANCHOR_BEGIN,ANCHOR_BEGIN,ANCHOR_END,ANCHOR_BEGIN);
+		} break;
+		case ANCHOR_ALIGN_LEFT_WIDE: {
+			_set_anchor(ANCHOR_BEGIN,ANCHOR_BEGIN,ANCHOR_BEGIN,ANCHOR_END);
+		} break;
+		case ANCHOR_ALIGN_RIGHT_WIDE: {
+			_set_anchor(ANCHOR_END,ANCHOR_BEGIN,ANCHOR_END,ANCHOR_END);
+		} break;
+		case ANCHOR_ALIGN_BOTTOM_WIDE: {
+			_set_anchor(ANCHOR_BEGIN,ANCHOR_END,ANCHOR_END,ANCHOR_END);
+		} break;
+		case ANCHOR_ALIGN_VCENTER_WIDE: {
+			_set_anchor(ANCHOR_CENTER,ANCHOR_BEGIN,ANCHOR_CENTER,ANCHOR_END);
+		} break;
+		case ANCHOR_ALIGN_HCENTER_WIDE: {
+			_set_anchor(ANCHOR_BEGIN,ANCHOR_CENTER,ANCHOR_END,ANCHOR_CENTER);
+		} break;
+		case ANCHOR_ALIGN_WIDE: {
+			_set_anchor(ANCHOR_BEGIN,ANCHOR_BEGIN,ANCHOR_END,ANCHOR_END);
+		} break;
+
 		case ANIM_INSERT_KEY:
 		case ANIM_INSERT_KEY_EXISTING: {
 
@@ -2999,6 +3111,14 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
 	p->add_item("Center Selection", VIEW_CENTER_TO_SELECTION, KEY_F);
 	p->add_item("Frame Selection", VIEW_FRAME_TO_SELECTION, KEY_MASK_CMD|KEY_F);
 
+	anchor_menu = memnew( MenuButton );
+	anchor_menu->set_text("Anchor");
+	hb->add_child(anchor_menu);
+	anchor_menu->get_popup()->connect("item_pressed", this,"_popup_callback");
+	anchor_menu->hide();
+
+	//p = anchor_menu->get_popup();
+
 
 
 	animation_hb = memnew( HBoxContainer );
diff --git a/tools/editor/plugins/canvas_item_editor_plugin.h b/tools/editor/plugins/canvas_item_editor_plugin.h
index 48a34e2d077..485422028e1 100644
--- a/tools/editor/plugins/canvas_item_editor_plugin.h
+++ b/tools/editor/plugins/canvas_item_editor_plugin.h
@@ -90,6 +90,23 @@ class CanvasItemEditor : public VBoxContainer {
 		UNGROUP_SELECTED,
 		ALIGN_HORIZONTAL,
 		ALIGN_VERTICAL,
+		ANCHOR_ALIGN_TOP_LEFT,
+		ANCHOR_ALIGN_TOP_RIGHT,
+		ANCHOR_ALIGN_BOTTOM_LEFT,
+		ANCHOR_ALIGN_BOTTOM_RIGHT,
+		ANCHOR_ALIGN_CENTER_LEFT,
+		ANCHOR_ALIGN_CENTER_RIGHT,
+		ANCHOR_ALIGN_CENTER_TOP,
+		ANCHOR_ALIGN_CENTER_BOTTOM,
+		ANCHOR_ALIGN_CENTER,
+		ANCHOR_ALIGN_TOP_WIDE,
+		ANCHOR_ALIGN_LEFT_WIDE,
+		ANCHOR_ALIGN_RIGHT_WIDE,
+		ANCHOR_ALIGN_BOTTOM_WIDE,
+		ANCHOR_ALIGN_VCENTER_WIDE,
+		ANCHOR_ALIGN_HCENTER_WIDE,
+		ANCHOR_ALIGN_WIDE,
+
 		SPACE_HORIZONTAL,
 		SPACE_VERTICAL,
 		EXPAND_TO_PARENT,
@@ -225,6 +242,7 @@ class CanvasItemEditor : public VBoxContainer {
 	MenuButton *view_menu;
 	HBoxContainer *animation_hb;
 	MenuButton *animation_menu;
+	MenuButton *anchor_menu;
 
 	Button *key_loc_button;
 	Button *key_rot_button;
@@ -305,6 +323,8 @@ class CanvasItemEditor : public VBoxContainer {
 	void _viewport_input_event(const InputEvent& p_event);
 	void _viewport_draw();
 
+	void _set_anchor(Control::AnchorType p_left,Control::AnchorType p_top,Control::AnchorType p_right,Control::AnchorType p_bottom);
+
 	HSplitContainer *palette_split;
 	VSplitContainer *bottom_split;
 
diff --git a/tools/editor/plugins/mesh_editor_plugin.cpp b/tools/editor/plugins/mesh_editor_plugin.cpp
index 2c64b2eb6b8..13d4c8db5ad 100644
--- a/tools/editor/plugins/mesh_editor_plugin.cpp
+++ b/tools/editor/plugins/mesh_editor_plugin.cpp
@@ -216,6 +216,8 @@ MeshInstanceEditor::MeshInstanceEditor() {
 	SpatialEditor::get_singleton()->add_control_to_menu_panel(options);
 
 	options->set_text("Mesh");
+	options->set_icon(EditorNode::get_singleton()->get_gui_base()->get_icon("MeshInstance","EditorIcons"));
+
 	options->get_popup()->add_item("Create Trimesh Static Body",MENU_OPTION_CREATE_STATIC_TRIMESH_BODY);
 	options->get_popup()->add_item("Create Convex Static Body",MENU_OPTION_CREATE_STATIC_CONVEX_BODY);
 	options->get_popup()->add_separator();
diff --git a/tools/editor/plugins/multimesh_editor_plugin.cpp b/tools/editor/plugins/multimesh_editor_plugin.cpp
index 0df906117eb..3c88b1d3a8a 100644
--- a/tools/editor/plugins/multimesh_editor_plugin.cpp
+++ b/tools/editor/plugins/multimesh_editor_plugin.cpp
@@ -330,6 +330,8 @@ MultiMeshEditor::MultiMeshEditor() {
 	options->set_area_as_parent_rect();
 
 	options->set_text("MultiMesh");
+	options->set_icon(EditorNode::get_singleton()->get_gui_base()->get_icon("MultiMeshInstance","EditorIcons"));
+
 	options->get_popup()->add_item("Populate Surface");
 	options->get_popup()->connect("item_pressed", this,"_menu_option");
 
diff --git a/tools/editor/plugins/particles_2d_editor_plugin.cpp b/tools/editor/plugins/particles_2d_editor_plugin.cpp
index fdf534a3a84..dadfa8bfdc7 100644
--- a/tools/editor/plugins/particles_2d_editor_plugin.cpp
+++ b/tools/editor/plugins/particles_2d_editor_plugin.cpp
@@ -146,6 +146,7 @@ void Particles2DEditorPlugin::_notification(int p_what) {
 	if (p_what==NOTIFICATION_ENTER_TREE) {
 
 		menu->get_popup()->connect("item_pressed",this,"_menu_callback");
+		menu->set_icon(menu->get_popup()->get_icon("Particles2D","EditorIcons"));
 		file->connect("file_selected",this,"_file_selected");
 	}
 }
diff --git a/tools/editor/plugins/particles_editor_plugin.cpp b/tools/editor/plugins/particles_editor_plugin.cpp
index f6f01d82ca9..5c84d9a86aa 100644
--- a/tools/editor/plugins/particles_editor_plugin.cpp
+++ b/tools/editor/plugins/particles_editor_plugin.cpp
@@ -111,6 +111,7 @@ void ParticlesEditor::_populate() {
 void ParticlesEditor::_notification(int p_notification) {
 
 	if (p_notification==NOTIFICATION_ENTER_TREE) {
+		options->set_icon(options->get_popup()->get_icon("Particles","EditorIcons"));
 
 	}
 }
diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp
index 77663f39c09..8fc6a6931e7 100644
--- a/tools/editor/plugins/spatial_editor_plugin.cpp
+++ b/tools/editor/plugins/spatial_editor_plugin.cpp
@@ -2168,7 +2168,18 @@ void SpatialEditorViewport::set_state(const Dictionary& p_state) {
 		view_menu->get_popup()->set_item_checked( idx, listener );
 	}
 
-
+	if (p_state.has("previewing")) {
+		Node *pv = EditorNode::get_singleton()->get_edited_scene()->get_node(p_state["previewing"]);
+		if (pv && pv->cast_to<Camera>()) {
+			previewing=pv->cast_to<Camera>();
+			previewing->connect("exit_tree",this,"_preview_exited_scene");
+			VS::get_singleton()->viewport_attach_camera( viewport->get_viewport(), previewing->get_camera() ); //replace
+			view_menu->hide();
+			surface->update();
+			preview_camera->set_pressed(true);
+			preview_camera->show();
+		}
+	}
 }
 
 Dictionary SpatialEditorViewport::get_state() const {
@@ -2181,6 +2192,10 @@ Dictionary SpatialEditorViewport::get_state() const {
 	d["use_environment"]=camera->get_environment().is_valid();
 	d["use_orthogonal"]=camera->get_projection()==Camera::PROJECTION_ORTHOGONAL;
 	d["listener"]=viewport->is_audio_listener();
+	if (previewing) {
+		d["previewing"]=EditorNode::get_singleton()->get_edited_scene()->get_path_to(previewing);
+	}
+
 	return d;
 }
 
diff --git a/tools/editor/project_export.cpp b/tools/editor/project_export.cpp
index a087f23c250..9f871fd3ab2 100644
--- a/tools/editor/project_export.cpp
+++ b/tools/editor/project_export.cpp
@@ -80,7 +80,7 @@ bool ProjectExportDialog::_create_tree(TreeItem *p_parent,EditorFileSystemDirect
 		String path = p_dir->get_file_path(i);
 		fitem->set_tooltip(0,path);
 		fitem->set_metadata(0,path);
-		Ref<Texture> icon = get_icon( (has_icon(p_dir->get_file_type(i),"EditorIcons")?p_dir->get_file_type(i):String("Object")),"EditorIcons");
+		Ref<Texture> icon = get_icon( (has_icon(p_dir->get_file_type(i),ei)?p_dir->get_file_type(i):ot),ei);
 		fitem->set_icon(0,icon);
 
 		fitem->set_cell_mode(1,TreeItem::CELL_MODE_RANGE);
@@ -1216,6 +1216,7 @@ ProjectExportDialog::ProjectExportDialog(EditorNode *p_editor) {
 	group_image_action->add_item("Default");
 	group_image_action->add_item("Compress Disk");
 	group_image_action->add_item("Compress RAM");
+	group_image_action->add_item("Keep Original");
 	group_options->add_margin_child("Compress Mode:",group_image_action);
 	group_image_action->connect("item_selected",this,"_group_changed");
 
@@ -1372,6 +1373,8 @@ ProjectExportDialog::ProjectExportDialog(EditorNode *p_editor) {
 	button_export = add_button("Export..",!OS::get_singleton()->get_swap_ok_cancel(),"export_pck");
 	updating_script=false;
 
+	ei="EditorIcons";
+	ot="Object";
 
 }
 
diff --git a/tools/editor/project_export.h b/tools/editor/project_export.h
index c88233ae01f..d85e688e585 100644
--- a/tools/editor/project_export.h
+++ b/tools/editor/project_export.h
@@ -78,6 +78,9 @@ private:
 	HBoxContainer *plat_errors;
 	Label *platform_error_string;
 
+	StringName ei;
+	StringName ot;
+
 	Tree * tree;
 
 	EditorFileDialog *pck_export;
diff --git a/tools/editor/project_settings.cpp b/tools/editor/project_settings.cpp
index fea9c705ef4..25a27501660 100644
--- a/tools/editor/project_settings.cpp
+++ b/tools/editor/project_settings.cpp
@@ -771,18 +771,47 @@ void ProjectSettings::_autoload_add() {
 
 void ProjectSettings::_autoload_delete(Object *p_item,int p_column, int p_button) {
 
+
 	TreeItem *ti=p_item->cast_to<TreeItem>();
 	String name = "autoload/"+ti->get_text(0);
 
-	undo_redo->create_action("Remove Autoload");
-	undo_redo->add_do_property(Globals::get_singleton(),name,Variant());
-	undo_redo->add_undo_property(Globals::get_singleton(),name,Globals::get_singleton()->get(name));
-	undo_redo->add_undo_method(Globals::get_singleton(),"set_persisting",name,true);
-	undo_redo->add_do_method(this,"_update_autoload");
-	undo_redo->add_undo_method(this,"_update_autoload");
-	undo_redo->add_do_method(this,"_settings_changed");
-	undo_redo->add_undo_method(this,"_settings_changed");
-	undo_redo->commit_action();
+	if (p_button==0) {
+		//delete
+		undo_redo->create_action("Remove Autoload");
+		undo_redo->add_do_property(Globals::get_singleton(),name,Variant());
+		undo_redo->add_undo_property(Globals::get_singleton(),name,Globals::get_singleton()->get(name));
+		undo_redo->add_undo_method(Globals::get_singleton(),"set_persisting",name,true);
+		undo_redo->add_do_method(this,"_update_autoload");
+		undo_redo->add_undo_method(this,"_update_autoload");
+		undo_redo->add_do_method(this,"_settings_changed");
+		undo_redo->add_undo_method(this,"_settings_changed");
+		undo_redo->commit_action();
+	} else {
+
+		TreeItem *swap;
+
+		if (p_button==1) {
+			swap=ti->get_prev();
+		} else if (p_button==2) {
+			swap=ti->get_next();
+		}
+		if (!swap)
+			return;
+
+		String swap_name= "autoload/"+swap->get_text(0);
+
+		undo_redo->create_action("Move Autoload");
+		undo_redo->add_do_method(Globals::get_singleton(),"set_order",swap_name,Globals::get_singleton()->get_order(name));
+		undo_redo->add_do_method(Globals::get_singleton(),"set_order",name,Globals::get_singleton()->get_order(swap_name));
+		undo_redo->add_undo_method(Globals::get_singleton(),"set_order",swap_name,Globals::get_singleton()->get_order(swap_name));
+		undo_redo->add_undo_method(Globals::get_singleton(),"set_order",name,Globals::get_singleton()->get_order(name));
+		undo_redo->add_do_method(this,"_update_autoload");
+		undo_redo->add_undo_method(this,"_update_autoload");
+		undo_redo->add_do_method(this,"_settings_changed");
+		undo_redo->add_undo_method(this,"_settings_changed");
+		undo_redo->commit_action();
+
+	}
 
 }
 
@@ -1134,6 +1163,8 @@ void ProjectSettings::_update_autoload() {
 		TreeItem *t = autoload_list->create_item(root);
 		t->set_text(0,name);
 		t->set_text(1,Globals::get_singleton()->get(pi.name));
+		t->add_button(1,get_icon("MoveUp","EditorIcons"),1);
+		t->add_button(1,get_icon("MoveDown","EditorIcons"),2);
 		t->add_button(1,get_icon("Del","EditorIcons"),0);
 
 	}
diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp
index 955c426d2b2..b513e32c13d 100644
--- a/tools/editor/property_editor.cpp
+++ b/tools/editor/property_editor.cpp
@@ -39,6 +39,9 @@
 #include "editor_settings.h"
 #include "editor_import_export.h"
 #include "editor_node.h"
+#include "multi_node_edit.h"
+#include "array_property_edit.h"
+#include "editor_help.h"
 
 void CustomPropertyEditor::_notification(int p_what) {
 	
@@ -2212,6 +2215,23 @@ void PropertyEditor::update_tree() {
 			sep->set_selectable(1,false);
 			sep->set_custom_bg_color(0,get_color("prop_category","Editor"));
 			sep->set_custom_bg_color(1,get_color("prop_category","Editor"));
+
+			if (use_doc_hints) {
+				StringName type=p.name;
+				if (!class_descr_cache.has(type)) {
+
+					String descr;
+					DocData *dd=EditorHelp::get_doc_data();
+					Map<String,DocData::ClassDoc>::Element *E=dd->class_list.find(type);
+					if (E) {
+						descr=E->get().brief_description;
+					}
+					class_descr_cache[type]=descr.world_wrap(80);
+
+				}
+
+				sep->set_tooltip(0,"Class: "+p.name+":\n\n"+class_descr_cache[type]);
+			}
 			//sep->set_custom_color(0,Color(1,1,1));
 
 
@@ -2265,6 +2285,42 @@ void PropertyEditor::update_tree() {
 
 		item->set_tooltip(0, p.name);
 
+		if (use_doc_hints) {
+			StringName setter;
+			StringName type;
+			if (ObjectTypeDB::get_setter_and_type_for_property(obj->get_type_name(),p.name,type,setter)) {
+
+				String descr;
+				bool found=false;
+				Map<StringName,Map<StringName,String> >::Element *E=descr_cache.find(type);
+				if (E) {
+
+					Map<StringName,String>::Element *F=E->get().find(setter);
+					if (F) {
+						found=true;
+						descr=F->get();
+					}
+				}
+				if (!found) {
+
+					DocData *dd=EditorHelp::get_doc_data();
+					Map<String,DocData::ClassDoc>::Element *E=dd->class_list.find(type);
+					if (E) {
+						for(int i=0;i<E->get().methods.size();i++) {
+							if (E->get().methods[i].name==setter.operator String()) {
+								descr=E->get().methods[i].description.strip_edges().world_wrap(80);
+							}
+						}
+					}
+
+					descr_cache[type][setter]=descr;
+				}
+
+				item->set_tooltip(0, "Property: "+p.name+"\n\n"+descr);
+			}
+		}
+		//EditorHelp::get_doc_data();
+
 		Dictionary d;
 		d["name"]=p.name;
 		d["type"]=(int)p.type;
@@ -2347,8 +2403,10 @@ void PropertyEditor::update_tree() {
 
 
 				item->set_cell_mode( 1, TreeItem::CELL_MODE_RANGE );
+				if (p.hint==PROPERTY_HINT_SPRITE_FRAME) {
+					item->set_range_config(1,0,99999,1);
 
-				if (p.hint==PROPERTY_HINT_RANGE || p.hint==PROPERTY_HINT_EXP_RANGE) {
+				} else if (p.hint==PROPERTY_HINT_RANGE || p.hint==PROPERTY_HINT_EXP_RANGE) {
 
 					int c = p.hint_string.get_slice_count(",");
 					float min=0,max=100,step=1;
@@ -2449,11 +2507,32 @@ void PropertyEditor::update_tree() {
 				}
 
 			} break;
+			case Variant::ARRAY: {
+
+				item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM );
+				item->add_button(1,get_icon("EditResource","EditorIcons"));
+
+
+				Variant v = obj->get(p.name);
+				if (v.is_array())
+					item->set_text(1,"Array["+itos(v.call("size"))+"]");
+				else
+					item->set_text(1,"Array[]");
+				item->set_icon( 0, get_icon("ArrayData","EditorIcons") );
+
+
+			} break;
+
 			case Variant::INT_ARRAY: {
 
 				item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM );
-				item->set_editable( 1, !read_only );
-				item->set_text(1,"[IntArray]");
+				item->add_button(1,get_icon("EditResource","EditorIcons"));
+
+				Variant v = obj->get(p.name);
+				if (v.is_array())
+					item->set_text(1,"IntArray["+itos(v.call("size"))+"]");
+				else
+					item->set_text(1,"IntArray[]");
 				item->set_icon( 0, get_icon("ArrayInt","EditorIcons") );
 
 
@@ -2461,26 +2540,86 @@ void PropertyEditor::update_tree() {
 			case Variant::REAL_ARRAY: {
 
 				item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM );
-				item->set_editable( 1, !read_only );
-				item->set_text(1,"[RealArray]");
+				item->add_button(1,get_icon("EditResource","EditorIcons"));
+
+				Variant v = obj->get(p.name);
+				if (v.is_array())
+					item->set_text(1,"FloatArray["+itos(v.call("size"))+"]");
+				else
+					item->set_text(1,"FloatArray[]");
 				item->set_icon( 0, get_icon("ArrayReal","EditorIcons") );
 
+
 			} break;
 			case Variant::STRING_ARRAY: {
 
 				item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM );
-				item->set_editable( 1, !read_only );
-				item->set_text(1,"[StringArray]");
+				item->add_button(1,get_icon("EditResource","EditorIcons"));
+
+				Variant v = obj->get(p.name);
+				if (v.is_array())
+					item->set_text(1,"String["+itos(v.call("size"))+"]");
+				else
+					item->set_text(1,"String[]");
 				item->set_icon( 0, get_icon("ArrayString","EditorIcons") );
 
+
 			} break;
 			case Variant::RAW_ARRAY: {
 
 				item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM );
-				item->set_editable( 1, !read_only );
-				item->set_text(1,"[Raw Data]");
+				item->add_button(1,get_icon("EditResource","EditorIcons"));
+
+				Variant v = obj->get(p.name);
+				if (v.is_array())
+					item->set_text(1,"Byte["+itos(v.call("size"))+"]");
+				else
+					item->set_text(1,"Byte[]");
 				item->set_icon( 0, get_icon("ArrayData","EditorIcons") );
 
+
+			} break;
+			case Variant::VECTOR2_ARRAY: {
+
+				item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM );
+				item->add_button(1,get_icon("EditResource","EditorIcons"));
+
+				Variant v = obj->get(p.name);
+				if (v.is_array())
+					item->set_text(1,"Vector2["+itos(v.call("size"))+"]");
+				else
+					item->set_text(1,"Vector2[]");
+				item->set_icon( 0, get_icon("Vector2","EditorIcons") );
+
+
+			} break;
+			case Variant::VECTOR3_ARRAY: {
+
+				item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM );
+				item->add_button(1,get_icon("EditResource","EditorIcons"));
+
+				Variant v = obj->get(p.name);
+				if (v.is_array())
+					item->set_text(1,"Vector3["+itos(v.call("size"))+"]");
+				else
+					item->set_text(1,"Vector3[]");
+				item->set_icon( 0, get_icon("Vector","EditorIcons") );
+
+
+			} break;
+			case Variant::COLOR_ARRAY: {
+
+				item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM );
+				item->add_button(1,get_icon("EditResource","EditorIcons"));
+
+				Variant v = obj->get(p.name);
+				if (v.is_array())
+					item->set_text(1,"Color["+itos(v.call("size"))+"]");
+				else
+					item->set_text(1,"Color[]");
+				item->set_icon( 0, get_icon("Color","EditorIcons") );
+
+
 			} break;
 			case Variant::VECTOR2: {
 
@@ -2676,7 +2815,7 @@ void PropertyEditor::_edit_set(const String& p_name, const Variant& p_value) {
 		}
 	}
 
-	if (!undo_redo) {
+	if (!undo_redo || obj->cast_to<MultiNodeEdit>() || obj->cast_to<ArrayPropertyEdit>()) { //kind of hacky
 
 		obj->set(p_name,p_value);
 		_changed_callbacks(obj,p_name);
@@ -2996,6 +3135,19 @@ void PropertyEditor::_edit_button(Object *p_item, int p_column, int p_button) {
 
 				emit_signal("resource_selected",r,n);
 			}
+		} else if (t==Variant::ARRAY || t==Variant::INT_ARRAY || t==Variant::REAL_ARRAY || t==Variant::STRING_ARRAY || t==Variant::VECTOR2_ARRAY || t==Variant::VECTOR3_ARRAY || t==Variant::COLOR_ARRAY || t==Variant::RAW_ARRAY) {
+
+			Variant v = obj->get(n);
+
+			if (v.get_type()!=t) {
+				Variant::CallError ce;
+				v=Variant::construct(Variant::Type(t),NULL,0,ce);
+			}
+
+			Ref<ArrayPropertyEdit> ape = memnew( ArrayPropertyEdit );
+			ape->edit(obj,n,Variant::Type(t));
+
+			EditorNode::get_singleton()->push_item(ape.ptr());
 		}
 	}
 }
@@ -3181,6 +3333,7 @@ PropertyEditor::PropertyEditor() {
 	read_only=false;
 	show_categories=false;
 	refresh_countdown=0;
+	use_doc_hints=false;
 	
 }
 
diff --git a/tools/editor/property_editor.h b/tools/editor/property_editor.h
index de5cac87110..36ecc794ed8 100644
--- a/tools/editor/property_editor.h
+++ b/tools/editor/property_editor.h
@@ -95,6 +95,7 @@ class CustomPropertyEditor : public Popup {
 	Button *checks20[20];
 
 
+
 	Control *easing_draw;
 
 	Object* owner;
@@ -157,9 +158,13 @@ class PropertyEditor : public Control {
 	bool read_only;
 	bool show_categories;
 	float refresh_countdown;
+	bool use_doc_hints;
 
 	HashMap<String,String> pending;
 	String selected_property;
+
+	Map<StringName,Map<StringName,String> > descr_cache;
+	Map<StringName,String > class_descr_cache;
 	
 	CustomPropertyEditor *custom_editor;
 	
@@ -217,6 +222,7 @@ public:
 	void set_autoclear(bool p_enable);
 
 	void set_show_categories(bool p_show);
+	void set_use_doc_hints(bool p_enable) { use_doc_hints=p_enable; }
 	
 	PropertyEditor();	
 	~PropertyEditor();
diff --git a/tools/editor/quick_open.cpp b/tools/editor/quick_open.cpp
index 749318386c4..6135a4ab649 100644
--- a/tools/editor/quick_open.cpp
+++ b/tools/editor/quick_open.cpp
@@ -30,8 +30,9 @@
 #include "os/keyboard.h"
 
 
-void EditorQuickOpen::popup(const String& p_base, bool p_dontclear) {
+void EditorQuickOpen::popup(const StringName &p_base, bool p_dontclear, bool p_add_dirs) {
 
+	add_directories=p_add_dirs;
 	popup_centered_ratio(0.6);
 	if (p_dontclear)
 		search_box->select_all();
@@ -66,27 +67,53 @@ void EditorQuickOpen::_sbox_input(const InputEvent& p_ie) {
 
 void EditorQuickOpen::_parse_fs(EditorFileSystemDirectory *efsd) {
 
-	for(int i=0;i<efsd->get_subdir_count();i++) {
+	if (!add_directories) {
+		for(int i=0;i<efsd->get_subdir_count();i++) {
 
-		_parse_fs(efsd->get_subdir(i));
+			_parse_fs(efsd->get_subdir(i));
+		}
 	}
 
+	TreeItem *root = search_options->get_root();
+
+	if (add_directories) {
+		String path = efsd->get_path();
+		if (!path.ends_with("/"))
+			path+="/";
+		if (path!="res://") {
+			path=path.substr(6,path.length());
+			if (path.findn(search_box->get_text())!=-1) {
+				TreeItem *ti = search_options->create_item(root);
+				ti->set_text(0,path);
+				Ref<Texture> icon = get_icon("folder","FileDialog");
+				ti->set_icon(0,icon);
+			}
+		}
+	}
 	for(int i=0;i<efsd->get_file_count();i++) {
 
 		String file = efsd->get_file_path(i);
 		file=file.substr(6,file.length());
 		if (ObjectTypeDB::is_type(efsd->get_file_type(i),base_type) && (search_box->get_text()=="" || file.findn(search_box->get_text())!=-1)) {
 
-			TreeItem *root = search_options->get_root();
 			TreeItem *ti = search_options->create_item(root);
 			ti->set_text(0,file);
-			Ref<Texture> icon = get_icon( (has_icon(efsd->get_file_type(i),"EditorIcons")?efsd->get_file_type(i):String("Object")),"EditorIcons");
+			Ref<Texture> icon = get_icon( (has_icon(efsd->get_file_type(i),ei)?efsd->get_file_type(i):ot),ei);
 			ti->set_icon(0,icon);
 			if (root->get_children()==ti)
 				ti->select(0);
 
 		}
 	}
+
+
+	if (add_directories) {
+		for(int i=0;i<efsd->get_subdir_count();i++) {
+
+			_parse_fs(efsd->get_subdir(i));
+		}
+	}
+
 }
 
 void EditorQuickOpen::_update_search() {
@@ -118,7 +145,7 @@ void EditorQuickOpen::_notification(int p_what) {
 }
 
 
-String EditorQuickOpen::get_base_type() const {
+StringName EditorQuickOpen::get_base_type() const {
 
 	return base_type;
 }
@@ -152,4 +179,7 @@ EditorQuickOpen::EditorQuickOpen() {
 	set_hide_on_ok(false);
 	search_options->connect("item_activated",this,"_confirmed");
 	search_options->set_hide_root(true);
+	ei="EditorIcons";
+	ot="Object";
+	add_directories=false;
 }
diff --git a/tools/editor/quick_open.h b/tools/editor/quick_open.h
index 63652a442ad..8b38256d39d 100644
--- a/tools/editor/quick_open.h
+++ b/tools/editor/quick_open.h
@@ -38,7 +38,11 @@ class EditorQuickOpen : public ConfirmationDialog {
 
 	LineEdit *search_box;
 	Tree *search_options;
-	String base_type;
+	StringName base_type;
+	StringName ei;
+	StringName ot;
+	bool add_directories;
+
 
 	void _update_search();
 
@@ -55,9 +59,9 @@ protected:
 	static void _bind_methods();
 public:
 
-	String get_base_type() const;
+	StringName get_base_type() const;
 
-	void popup(const String& p_base,bool p_dontclear=false);
+	void popup(const StringName& p_base,bool p_dontclear=false,bool p_add_dirs=false);
 	EditorQuickOpen();
 };
 
diff --git a/tools/editor/scene_tree_dock.cpp b/tools/editor/scene_tree_dock.cpp
index ae0b58a6653..276f2dea33a 100644
--- a/tools/editor/scene_tree_dock.cpp
+++ b/tools/editor/scene_tree_dock.cpp
@@ -35,7 +35,7 @@
 #include "tools/editor/plugins/canvas_item_editor_plugin.h"
 #include "script_editor_debugger.h"
 #include "tools/editor/plugins/script_editor_plugin.h"
-
+#include "multi_node_edit.h"
 void SceneTreeDock::_unhandled_key_input(InputEvent p_event) {
 
 
@@ -449,6 +449,19 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 			reparent_dialog->popup_centered_ratio();
 			reparent_dialog->set_current( nodeset );
 
+		} break;
+		case TOOL_MULTI_EDIT: {
+
+			Node*root=EditorNode::get_singleton()->get_edited_scene();
+			if (!root)
+				break;
+			Ref<MultiNodeEdit> mne = memnew( MultiNodeEdit );
+			for (const Map<Node*,Object*>::Element *E=EditorNode::get_singleton()->get_editor_selection()->get_selection().front();E;E=E->next()) {
+				mne->add_node(root->get_path_to(E->key()));
+			}
+
+			EditorNode::get_singleton()->push_item(mne.ptr());
+
 		} break;
 		case TOOL_ERASE: {
 
@@ -507,6 +520,7 @@ void SceneTreeDock::_notification(int p_what) {
 				"MoveDown",
 				"Duplicate",
 				"Reparent",
+				"MultiNodeEdit",
 				"Remove",
 			};
 
@@ -515,6 +529,8 @@ void SceneTreeDock::_notification(int p_what) {
 			for(int i=0;i<TOOL_BUTTON_MAX;i++)
 				tool_buttons[i]->set_icon(get_icon(button_names[i],"EditorIcons"));
 
+			EditorNode::get_singleton()->get_editor_selection()->connect("selection_changed",this,"_selection_changed");
+
 		} break;
 	}
 }
@@ -1075,9 +1091,19 @@ void SceneTreeDock::_update_tool_buttons() {
 	tool_buttons[TOOL_DUPLICATE]->set_disabled(disable_root);
 	tool_buttons[TOOL_REPARENT]->set_disabled(disable_root);
 	tool_buttons[TOOL_ERASE]->set_disabled(disable);
+	tool_buttons[TOOL_MULTI_EDIT]->set_disabled(EditorNode::get_singleton()->get_editor_selection()->get_selection().size()<2);
+
 
 }
 
+
+void SceneTreeDock::_selection_changed() {
+
+	tool_buttons[TOOL_MULTI_EDIT]->set_disabled(EditorNode::get_singleton()->get_editor_selection()->get_selection().size()<2);
+
+}
+
+
 void SceneTreeDock::_create() {
 
 
@@ -1262,6 +1288,7 @@ void SceneTreeDock::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("_delete_confirm"),&SceneTreeDock::_delete_confirm);
 	ObjectTypeDB::bind_method(_MD("_node_prerenamed"),&SceneTreeDock::_node_prerenamed);
 	ObjectTypeDB::bind_method(_MD("_import_subscene"),&SceneTreeDock::_import_subscene);
+	ObjectTypeDB::bind_method(_MD("_selection_changed"),&SceneTreeDock::_selection_changed);
 
 	ObjectTypeDB::bind_method(_MD("instance"),&SceneTreeDock::instance);
 }
@@ -1364,6 +1391,12 @@ SceneTreeDock::SceneTreeDock(EditorNode *p_editor,Node *p_scene_root,EditorSelec
 
 	hbc_bottom->add_spacer();
 
+	tb = memnew( ToolButton );
+	tb->connect("pressed",this,"_tool_selected",make_binds(TOOL_MULTI_EDIT, false));
+	tb->set_tooltip("Multi-Edit Selected Nodes");
+	hbc_bottom->add_child(tb);
+	tool_buttons[TOOL_MULTI_EDIT]=tb;
+
 	tb = memnew( ToolButton );
 	tb->connect("pressed",this,"_tool_selected",make_binds(TOOL_ERASE, false));
 	tb->set_tooltip("Erase Selected Node(s)");
diff --git a/tools/editor/scene_tree_dock.h b/tools/editor/scene_tree_dock.h
index f0bbbad6bec..b1c53d2ff94 100644
--- a/tools/editor/scene_tree_dock.h
+++ b/tools/editor/scene_tree_dock.h
@@ -62,6 +62,7 @@ class SceneTreeDock : public VBoxContainer {
 		TOOL_MOVE_DOWN,
 		TOOL_DUPLICATE,
 		TOOL_REPARENT,
+		TOOL_MULTI_EDIT,
 		TOOL_ERASE,
 		TOOL_BUTTON_MAX
 	};
@@ -119,6 +120,7 @@ class SceneTreeDock : public VBoxContainer {
 	void _import_subscene();
 
 	bool _validate_no_foreign();
+	void _selection_changed();
 
 	void _fill_path_renames(Vector<StringName> base_path,Vector<StringName> new_base_path,Node * p_node, List<Pair<NodePath,NodePath> > *p_renames);
 
diff --git a/tools/editor/scenes_dock.cpp b/tools/editor/scenes_dock.cpp
index 91536167758..7d9c5b24b23 100644
--- a/tools/editor/scenes_dock.cpp
+++ b/tools/editor/scenes_dock.cpp
@@ -35,15 +35,30 @@
 #include "os/os.h"
 #include "editor_node.h"
 
+#include "editor_settings.h"
+
 bool ScenesDock::_create_tree(TreeItem *p_parent,EditorFileSystemDirectory *p_dir) {
 
-	String search_term = tree_filter->get_search_term();
-	ScenesDockFilter::FilterOption file_filter = tree_filter->get_file_filter();
 
 	TreeItem *item = tree->create_item(p_parent);
-	item->set_text(0,p_dir->get_name()+"/");
+	String dname=p_dir->get_name();
+	if (dname=="")
+		dname="res://";
+
+	item->set_text(0,dname);
 	item->set_icon(0,get_icon("Folder","EditorIcons"));
-	item->set_custom_bg_color(0,get_color("prop_subsection","Editor"));
+	item->set_selectable(0,true);
+	String lpath = p_dir->get_path();
+	if (lpath!="res://" && lpath.ends_with("/")) {
+		lpath=lpath.substr(0,lpath.length()-1);
+	}
+	item->set_metadata(0,lpath);
+	if (lpath==path) {
+		item->select(0);
+	}
+
+
+	//item->set_custom_bg_color(0,get_color("prop_subsection","Editor"));
 
 	bool has_items=false;
 
@@ -52,7 +67,7 @@ bool ScenesDock::_create_tree(TreeItem *p_parent,EditorFileSystemDirectory *p_di
 		if (_create_tree(item,p_dir->get_subdir(i)))
 			has_items=true;
 	}
-
+#if 0
 	for (int i=0;i<p_dir->get_file_count();i++) {
 
 		String file_name = p_dir->get_file(i);
@@ -89,13 +104,13 @@ bool ScenesDock::_create_tree(TreeItem *p_parent,EditorFileSystemDirectory *p_di
 		has_items=true;
 
 	}
-
-	if (!has_items) {
+#endif
+	/*if (!has_items) {
 
 		memdelete(item);
 		return false;
 
-	}
+	}*/
 
 	return true;
 }
@@ -105,7 +120,28 @@ void ScenesDock::_update_tree() {
 
 	tree->clear();
 	updating_tree=true;
-	_create_tree(NULL,EditorFileSystem::get_singleton()->get_filesystem());
+	TreeItem *root = tree->create_item();
+	TreeItem *favorites = tree->create_item(root);
+	favorites->set_icon(0, get_icon("Favorites","EditorIcons") );
+	favorites->set_text(0,"Favorites:");
+	favorites->set_selectable(0,false);
+	Vector<String> faves = 	EditorSettings::get_singleton()->get_favorite_dirs();
+	for(int i=0;i<faves.size();i++) {
+		if (!faves[i].begins_with("res://"))
+			continue;
+
+		TreeItem *ti = tree->create_item(favorites);
+		String fv = faves[i];
+		if (fv=="res://")
+			ti->set_text(0,"/");
+		else
+			ti->set_text(0,faves[i].get_file());
+		ti->set_icon(0,get_icon("Folder","EditorIcons"));
+		ti->set_selectable(0,true);
+		ti->set_metadata(0,faves[i]);
+	}
+
+	_create_tree(root,EditorFileSystem::get_singleton()->get_filesystem());
 	updating_tree=false;
 
 }
@@ -117,68 +153,192 @@ void ScenesDock::_notification(int p_what) {
 
 		case NOTIFICATION_ENTER_TREE: {
 
+			if (initialized)
+				return;
+			initialized=false;
 
-			EditorFileSystem::get_singleton()->connect("filesystem_changed",this,"_update_tree");
+			EditorFileSystem::get_singleton()->connect("filesystem_changed",this,"_fs_changed");
 
 			button_reload->set_icon( get_icon("Reload","EditorIcons"));
 			button_favorite->set_icon( get_icon("Favorites","EditorIcons"));
+			button_fav_up->set_icon( get_icon("MoveUp","EditorIcons"));
+			button_fav_down->set_icon( get_icon("MoveDown","EditorIcons"));
 			button_instance->set_icon( get_icon("Add","EditorIcons"));
 			button_open->set_icon( get_icon("Folder","EditorIcons"));
+			button_back->set_icon( get_icon("Filesystem","EditorIcons"));
+			display_mode->set_icon( get_icon("FileList","EditorIcons"));
+			display_mode->connect("pressed",this,"_change_file_display");
+			file_options->set_icon( get_icon("Tools","EditorIcons"));
+			files->connect("item_activated",this,"_select_file");
+			button_hist_next->connect("pressed",this,"_fw_history");
+			button_hist_prev->connect("pressed",this,"_bw_history");
 
-			String path = Globals::get_singleton()->get_resource_path()+"/favorites.cfg";
-			FileAccess *f=FileAccess::open(path,FileAccess::READ);
-			if (f) {
+			button_hist_next->set_icon( get_icon("Forward","EditorIcons"));
+			button_hist_prev->set_icon( get_icon("Back","EditorIcons"));
+			file_options->get_popup()->connect("item_pressed",this,"_file_option");
 
-				String l = f->get_line();
 
-				while(l!="") {
-					favorites.insert(l);
-					l = f->get_line();
+			button_back->connect("pressed",this,"_go_to_tree",varray(),CONNECT_DEFERRED);
+			current_path->connect("text_entered",this,"_go_to_dir");
+			_update_tree(); //maybe it finished already
 
-				}
-
-				f->close();
-				memdelete(f);
+			if (EditorFileSystem::get_singleton()->is_scanning()) {
+				_set_scannig_mode();
 			}
 
-
-
-			_update_tree(); //maybe it finished already
+		} break;
+		case NOTIFICATION_PROCESS: {
+			if (EditorFileSystem::get_singleton()->is_scanning()) {
+				scanning_progress->set_val(EditorFileSystem::get_singleton()->get_scanning_progress()*100);
+			}
 		} break;
 		case NOTIFICATION_EXIT_TREE: {
 
 		} break;
-		case NOTIFICATION_PROCESS: {
 
-		} break;
 	}
 
 }
 
-void ScenesDock::_favorite_toggled() {
 
-	if (updating_tree)
+
+
+void ScenesDock::_dir_selected() {
+
+	TreeItem *ti = tree->get_selected();
+	if (!ti)
 		return;
+	String dir = ti->get_metadata(0);
+	bool found=false;
+	Vector<String> favorites = EditorSettings::get_singleton()->get_favorite_dirs();
+	for(int i=0;i<favorites.size();i++) {
+
+		if (favorites[i]==dir) {
+			found=true;
+			break;
+		}
+	}
 
 
-	TreeItem *sel = tree->get_selected();
-	if (!sel)
-		return; //?
+	button_favorite->set_pressed(found);
+	if (ti->get_parent() && ti->get_parent()->get_parent()==tree->get_root() && !ti->get_parent()->get_prev()) {
 
-	bool faved = sel->is_checked(0);
-	String path = sel->get_metadata(0);
-	if (faved)
-		favorites.insert(path);
-	else
-		favorites.erase(path);
+		//a favorite!!!
+		button_fav_up->set_disabled(!ti->get_prev());
+		button_fav_down->set_disabled(!ti->get_next());
+	} else {
+		button_fav_up->set_disabled(true);
+		button_fav_down->set_disabled(true);
 
-	timer->start();
+	}
 
 }
 
-void ScenesDock::_favorites_toggled(bool p_toggled) {
+void ScenesDock::_fav_up_pressed() {
+
+	TreeItem *sel = tree->get_selected();
+	if (!sel)
+		return ;
+
+	if (!sel->get_prev())
+		return;
+
+	String sw = sel->get_prev()->get_metadata(0);
+	String txt = sel->get_metadata(0);
+
+	Vector<String> favorited = EditorSettings::get_singleton()->get_favorite_dirs();
+
+	int a_idx=favorited.find(sw);
+	int b_idx=favorited.find(txt);
+
+	if (a_idx==-1 || b_idx==-1)
+		return;
+	SWAP(favorited[a_idx],favorited[b_idx]);
+
+	EditorSettings::get_singleton()->set_favorite_dirs(favorited);
 
 	_update_tree();
+
+	if (!tree->get_root() || !tree->get_root()->get_children() || !tree->get_root()->get_children()->get_children())
+		return;
+	sel = tree->get_root()->get_children()->get_children();
+	while(sel) {
+
+		String t = sel->get_metadata(0);
+		if (t==txt) {
+			sel->select(0);
+			return;
+		}
+		sel=sel->get_next();
+	}
+}
+
+void ScenesDock::_fav_down_pressed() {
+
+	TreeItem *sel = tree->get_selected();
+	if (!sel)
+		return ;
+
+	if (!sel->get_next())
+		return;
+
+	String sw = sel->get_next()->get_metadata(0);
+	String txt = sel->get_metadata(0);
+
+	Vector<String> favorited = EditorSettings::get_singleton()->get_favorite_dirs();
+
+	int a_idx=favorited.find(sw);
+	int b_idx=favorited.find(txt);
+
+	if (a_idx==-1 || b_idx==-1)
+		return;
+	SWAP(favorited[a_idx],favorited[b_idx]);
+
+	EditorSettings::get_singleton()->set_favorite_dirs(favorited);
+
+	_update_tree();
+
+	if (!tree->get_root() || !tree->get_root()->get_children() || !tree->get_root()->get_children()->get_children())
+		return;
+	sel = tree->get_root()->get_children()->get_children();
+	while(sel) {
+
+		String t = sel->get_metadata(0);
+		if (t==txt) {
+			sel->select(0);
+			return;
+		}
+		sel=sel->get_next();
+	}
+}
+
+void ScenesDock::_favorites_pressed() {
+
+	TreeItem *sel = tree->get_selected();
+	if (!sel)
+		return ;
+	String dir = sel->get_metadata(0);
+
+	int idx = -1;
+	Vector<String> favorites = EditorSettings::get_singleton()->get_favorite_dirs();
+	for(int i=0;i<favorites.size();i++) {
+
+		if (favorites[i]==dir) {
+			idx=i;
+			break;
+		}
+	}
+
+	if (button_favorite->is_pressed() && idx==-1) {
+		favorites.push_back(dir);
+		EditorSettings::get_singleton()->set_favorite_dirs(favorites);
+		_update_tree();
+	} else if (!button_favorite->is_pressed() && idx!=-1) {
+		favorites.remove(idx);
+		EditorSettings::get_singleton()->set_favorite_dirs(favorites);
+		_update_tree();
+	}
+
 }
 
 String ScenesDock::get_selected_path() const {
@@ -199,65 +359,712 @@ void ScenesDock::_instance_pressed() {
 	emit_signal("instance",path);
 }
 
-void ScenesDock::_open_pressed(){
+void ScenesDock::_thumbnail_done(const String& p_path,const Ref<Texture>& p_preview, const Variant& p_udata) {
+
+	if (p_preview.is_valid() && path==p_path.get_base_dir()) {
+
+		int idx=p_udata;
+		if (idx>=files->get_item_count())
+			return;
+		String fpath = files->get_item_metadata(idx);
+		if (fpath!=p_path)
+			return;
+		files->set_item_icon(idx,p_preview);
 
-	TreeItem *sel = tree->get_selected();
-	if (!sel) {
-		return;
 	}
-	String path = sel->get_metadata(0);
 
-	if (ResourceLoader::get_resource_type(path)=="PackedScene") {
+}
+
+void ScenesDock::_change_file_display() {
+
+	if (display_mode->is_pressed()) {
+		display_mode->set_icon( get_icon("FileThumbnail","EditorIcons"));
+
+	} else {
+		display_mode->set_icon( get_icon("FileList","EditorIcons"));
+	}
+
+	_update_files(true);
+}
+
+void ScenesDock::_update_files(bool p_keep_selection) {
+
+	Set<String> cselection;
+
+	if (p_keep_selection) {
+
+		for(int i=0;i<files->get_item_count();i++) {
+
+			if (files->is_selected(i))
+				cselection.insert(files->get_item_text(i));
+		}
+	}
+
+	files->clear();
+
+	EditorFileSystemDirectory *efd = EditorFileSystem::get_singleton()->get_path(path);
+	if (!efd)
+		return;
+
+	int thumbnail_size = EditorSettings::get_singleton()->get("file_dialog/thumbnail_size");
+	Ref<Texture> folder_thumbnail;
+	Ref<Texture> file_thumbnail;
+
+	bool use_thumbnails=!display_mode->is_pressed();
+
+	if (use_thumbnails) { //thumbnails
+
+		files->set_max_columns(0);
+		files->set_icon_mode(ItemList::ICON_MODE_TOP);
+		files->set_fixed_column_width(thumbnail_size*3/2);
+		files->set_max_text_lines(2);
+		files->set_min_icon_size(Size2(thumbnail_size,thumbnail_size));
+
+		if (!has_icon("ResizedFolder","EditorIcons")) {
+			Ref<ImageTexture> folder = get_icon("FolderBig","EditorIcons");
+			Image img = folder->get_data();
+			img.resize(thumbnail_size,thumbnail_size);
+			Ref<ImageTexture> resized_folder = Ref<ImageTexture>( memnew( ImageTexture));
+			resized_folder->create_from_image(img,0);
+			Theme::get_default()->set_icon("ResizedFolder","EditorIcons",resized_folder);
+		}
+
+		folder_thumbnail = get_icon("ResizedFolder","EditorIcons");
+
+		if (!has_icon("ResizedFile","EditorIcons")) {
+			Ref<ImageTexture> file = get_icon("FileBig","EditorIcons");
+			Image img = file->get_data();
+			img.resize(thumbnail_size,thumbnail_size);
+			Ref<ImageTexture> resized_file = Ref<ImageTexture>( memnew( ImageTexture));
+			resized_file->create_from_image(img,0);
+			Theme::get_default()->set_icon("ResizedFile","EditorIcons",resized_file);
+		}
+
+		file_thumbnail = get_icon("ResizedFile","EditorIcons");
 
-		editor->open_request(path);
 	} else {
 
-		/*
+		files->set_icon_mode(ItemList::ICON_MODE_LEFT);
+		files->set_max_columns(1);
+		files->set_max_text_lines(1);
+		files->set_fixed_column_width(0);
+		files->set_min_icon_size(Size2());
 
-		RES res = ResourceLoader::load(path);
-		if (res.is_null()) {
+	}
 
 
+	if (path!="res://") {
+
+		if (use_thumbnails) {
+			files->add_item("..",folder_thumbnail,true);
+		} else {
+			files->add_item("..",get_icon("folder","FileDialog"),true);
+		}
+
+		String bd = path.get_base_dir();
+		if (bd!="res://" && !bd.ends_with("/"))
+			bd+="/";
+
+		files->set_item_metadata(files->get_item_count()-1,bd);
+	}
+
+	for(int i=0;i<efd->get_subdir_count();i++) {
+
+		String dname=efd->get_subdir(i)->get_name();
+
+
+		if (use_thumbnails) {
+			files->add_item(dname,folder_thumbnail,true);
+		} else {
+			files->add_item(dname,get_icon("folder","FileDialog"),true);
+		}
+
+		files->set_item_metadata(files->get_item_count()-1,path.plus_file(dname)+"/");
+
+		if (cselection.has(dname))
+			files->select(files->get_item_count()-1,false);
+	}
+
+	for(int i=0;i<efd->get_file_count();i++) {
+
+		String fname=efd->get_file(i);
+		String fp = path.plus_file(fname);
+
+
+		String type = efd->get_file_type(i);
+		Ref<Texture> type_icon;
+
+		if (has_icon(type,"EditorIcons")) {
+			type_icon=get_icon(type,"EditorIcons");
+		} else {
+			type_icon=get_icon("Object","EditorIcons");
+		}
+
+		if (use_thumbnails) {
+			files->add_item(fname,file_thumbnail,true);
+			files->set_item_metadata(files->get_item_count()-1,fp);
+			files->set_item_tag_icon(files->get_item_count()-1,type_icon);
+			EditorResourcePreview::get_singleton()->queue_resource_preview(fp,this,"_thumbnail_done",files->get_item_count()-1);
+		} else {
+			files->add_item(fname,type_icon,true);
+			files->set_item_metadata(files->get_item_count()-1,fp);
+
+		}
+
+		if (cselection.has(fname))
+			files->select(files->get_item_count()-1,false);
+
+	}
+
+
+}
+
+void ScenesDock::_select_file(int p_idx) {
+
+	files->select(p_idx,true);
+	_open_pressed();
+}
+
+void ScenesDock::_go_to_tree() {
+
+	tree->show();
+	files->hide();
+	path_hb->hide();
+	_update_tree();
+	tree->grab_focus();
+	tree->ensure_cursor_is_visible();
+	button_favorite->show();
+	button_fav_up->show();
+	button_fav_down->show();
+	button_open->hide();
+	button_instance->hide();
+	button_open->hide();
+	file_options->hide();
+	tree_mode=true;
+}
+
+void ScenesDock::_go_to_dir(const String& p_dir){
+
+	DirAccess *da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
+	if (da->change_dir(p_dir)==OK) {
+		path=da->get_current_dir();
+		_update_files(false);
+	}
+	current_path->set_text(path);
+	memdelete(da);
+
+
+}
+void ScenesDock::_fs_changed() {
+
+	button_hist_prev->set_disabled(history_pos==0);
+	button_hist_next->set_disabled(history_pos+1==history.size());
+	scanning_vb->hide();
+
+	if (tree_mode) {
+
+		tree->show();
+		button_favorite->show();
+		button_fav_up->show();
+		button_fav_down->show();
+		_update_tree();
+	} else {
+		files->show();
+		path_hb->show();
+		button_instance->show();
+		button_open->show();
+		file_options->show();
+		_update_files(true);
+	}
+
+	set_process(false);
+}
+
+void ScenesDock::_set_scannig_mode() {
+
+	tree->hide();
+	button_favorite->hide();
+	button_fav_up->hide();
+	button_fav_down->hide();
+	button_instance->hide();
+	button_open->hide();
+	file_options->hide();
+	button_hist_prev->set_disabled(true);
+	button_hist_next->set_disabled(true);
+	scanning_vb->show();
+	path_hb->hide();
+	files->hide();
+	set_process(true);
+	if (EditorFileSystem::get_singleton()->is_scanning()) {
+		scanning_progress->set_val(EditorFileSystem::get_singleton()->get_scanning_progress()*100);
+	} else {
+		scanning_progress->set_val(0);
+	}
+
+}
+
+void ScenesDock::_fw_history() {
+
+	if (history_pos<history.size()-1)
+		history_pos++;
+
+	path=history[history_pos];
+
+	if (tree_mode) {
+		_update_tree();
+		tree->grab_focus();
+		tree->ensure_cursor_is_visible();
+	} else {
+		_update_files(false);
+		current_path->set_text(path);
+	}
+
+	button_hist_prev->set_disabled(history_pos==0);
+	button_hist_next->set_disabled(history_pos+1==history.size());
+
+}
+
+void ScenesDock::_bw_history() {
+
+	if (history_pos>0)
+		history_pos--;
+
+	path=history[history_pos];
+
+	if (tree_mode) {
+		_update_tree();
+		tree->grab_focus();
+		tree->ensure_cursor_is_visible();
+	} else {
+		_update_files(false);
+		current_path->set_text(path);
+	}
+
+	button_hist_prev->set_disabled(history_pos==0);
+	button_hist_next->set_disabled(history_pos+1==history.size());
+
+}
+
+void ScenesDock::_push_to_history() {
+
+	history.resize(history_pos+1);
+	if (history[history_pos]!=path) {
+		history.push_back(path);
+		history_pos++;
+	}
+
+	button_hist_prev->set_disabled(history_pos==0);
+	button_hist_next->set_disabled(history_pos+1==history.size());
+
+}
+
+
+void ScenesDock::_find_inside_move_files(EditorFileSystemDirectory *efsd,Vector<String>& files) {
+
+	for(int i=0;i<efsd->get_subdir_count();i++) {
+		_find_inside_move_files(efsd->get_subdir(i),files);
+	}
+	for(int i=0;i<efsd->get_file_count();i++) {
+		files.push_back(efsd->get_file_path(i));
+	}
+
+}
+
+void ScenesDock::_find_remaps(EditorFileSystemDirectory *efsd,Map<String,String> &renames,List<String>& to_remaps) {
+
+	for(int i=0;i<efsd->get_subdir_count();i++) {
+		_find_remaps(efsd->get_subdir(i),renames,to_remaps);
+	}
+	for(int i=0;i<efsd->get_file_count();i++) {
+		Vector<String> deps=efsd->get_file_deps(i);
+		for(int j=0;j<deps.size();j++) {
+			if (renames.has(deps[j])) {
+				to_remaps.push_back(efsd->get_file_path(i));
+				break;
+			}
+		}
+	}
+}
+
+
+void ScenesDock::_rename_operation(const String& p_to_path) {
+
+	if (move_files[0]==p_to_path) {
+		EditorNode::get_singleton()->show_warning("Same source and destination files, doing nothing.");
+		return;
+	}
+	if (FileAccess::exists(p_to_path)) {
+		EditorNode::get_singleton()->show_warning("Target file exists, can't overwrite. Delete first.");
+		return;
+	}
+
+	Map<String,String> renames;
+	renames[move_files[0]]=p_to_path;
+
+	List<String> remap;
+
+	_find_remaps(EditorFileSystem::get_singleton()->get_filesystem(),renames,remap);
+	print_line("found files to remap: "+itos(remap.size()));
+
+	//perform remaps
+	for(List<String>::Element *E=remap.front();E;E=E->next()) {
+
+		Error err = ResourceLoader::rename_dependencies(E->get(),renames);
+		print_line("remapping: "+E->get());
+
+		if (err!=OK) {
+			EditorNode::get_singleton()->add_io_error("Can't rename deps for:\n"+E->get()+"\n");
+		}
+	}
+
+	//finally, perform moves
+
+	DirAccess *da=DirAccess::create(DirAccess::ACCESS_RESOURCES);
+
+	Error err = da->rename(move_files[0],p_to_path);
+	print_line("moving file "+move_files[0]+" to "+p_to_path);
+	if (err!=OK) {
+		EditorNode::get_singleton()->add_io_error("Error moving file:\n"+move_files[0]+"\n");
+	}
+
+	//rescan everything
+	memdelete(da);
+	print_line("call rescan!");
+	_rescan();
+}
+
+
+void ScenesDock::_move_operation(const String& p_to_path) {
+
+	if (p_to_path==path) {
+		EditorNode::get_singleton()->show_warning("Same source and destination paths, doing nothing.");
+		return;
+	}
+
+	//find files inside dirs to be moved
+
+	Vector<String> inside_files;
+
+	for(int i=0;i<move_dirs.size();i++) {
+		if (p_to_path.begins_with(move_dirs[i])) {
+			EditorNode::get_singleton()->show_warning("Can't move directories to within themselves");
 			return;
+		}
+
+		EditorFileSystemDirectory *efsd=EditorFileSystem::get_singleton()->get_path(move_dirs[i]);
+		if (!efsd)
+			continue;
+		_find_inside_move_files(efsd,inside_files);
+	}
+
+	//make list of remaps
+	Map<String,String> renames;
+	String repfrom=path=="res://"?path:String(path+"/");
+	String repto=p_to_path=="res://"?p_to_path:String(p_to_path+"/");
+
+	for(int i=0;i<move_files.size();i++) {
+		renames[move_files[i]]=move_files[i].replace_first(repfrom,repto);
+		print_line("move file "+move_files[i]+" -> "+renames[move_files[i]]);
+	}
+	for(int i=0;i<inside_files.size();i++) {
+		renames[inside_files[i]]=inside_files[i].replace_first(repfrom,repto);
+		print_line("inside file "+inside_files[i]+" -> "+renames[inside_files[i]]);
+	}
+
+	//make list of files that will be run the remapping
+	List<String> remap;
+
+	_find_remaps(EditorFileSystem::get_singleton()->get_filesystem(),renames,remap);
+	print_line("found files to remap: "+itos(remap.size()));
+
+	//perform remaps
+	for(List<String>::Element *E=remap.front();E;E=E->next()) {
+
+		Error err = ResourceLoader::rename_dependencies(E->get(),renames);
+		print_line("remapping: "+E->get());
+
+		if (err!=OK) {
+			EditorNode::get_singleton()->add_io_error("Can't rename deps for:\n"+E->get()+"\n");
+		}
+	}
+
+	//finally, perform moves
+
+	DirAccess *da=DirAccess::create(DirAccess::ACCESS_RESOURCES);
+
+	for(int i=0;i<move_files.size();i++) {
+
+		String to = move_files[i].replace_first(repfrom,repto);
+		Error err = da->rename(move_files[i],to);
+		print_line("moving file "+move_files[i]+" to "+to);
+		if (err!=OK) {
+			EditorNode::get_singleton()->add_io_error("Error moving file:\n"+move_files[i]+"\n");
+		}
+	}
+
+	for(int i=0;i<move_dirs.size();i++) {
+
+		String to = p_to_path.plus_file(move_dirs[i].get_file());
+		Error err = da->rename(move_dirs[i],to);
+		print_line("moving dir "+move_dirs[i]+" to "+to);
+		if (err!=OK) {
+			EditorNode::get_singleton()->add_io_error("Error moving dir:\n"+move_dirs[i]+"\n");
+		}
+	}
+
+	memdelete(da);
+	//rescan everything
+	print_line("call rescan!");
+	_rescan();
+
+}
+
+void ScenesDock::_file_option(int p_option) {
+
+	switch(p_option) {
+
+		case FILE_DEPENDENCIES: {
+
+			int idx = files->get_current();
+			if (idx<0 || idx>=files->get_item_count())
+				break;
+			String path = files->get_item_metadata(idx);
+			deps_editor->edit(path);
+		} break;
+		case FILE_OWNERS: {
+
+			int idx = files->get_current();
+			if (idx<0 || idx>=files->get_item_count())
+				break;
+			String path = files->get_item_metadata(idx);
+			owners_editor->show(path);
+		} break;
+		case FILE_MOVE: {
+
+			move_dirs.clear();;
+			move_files.clear();
+
+			for(int i=0;i<files->get_item_count();i++) {
+
+				String path = files->get_item_metadata(i);
+				if (!files->is_selected(i))
+					continue;
+
+				 if (files->get_item_text(i)=="..") {
+					 EditorNode::get_singleton()->show_warning("Can't operate on '..'");
+					 return;
+				 }
+
+				if (path.ends_with("/")) {
+					move_dirs.push_back(path.substr(0,path.length()-1));
+				} else {
+					move_files.push_back(path);
+				}
+			}
+
+
+			if (move_dirs.empty() && move_files.size()==1) {
+
+				rename_dialog->clear_filters();
+				rename_dialog->add_filter("*."+move_files[0].extension());
+				rename_dialog->set_mode(EditorFileDialog::MODE_SAVE_FILE);
+				rename_dialog->set_current_path(move_files[0]);
+				rename_dialog->popup_centered_ratio();
+				rename_dialog->set_title("Pick New Name and Location For: "+move_files[0].get_file());
+
+
+			} else {
+				//just move
+				move_dialog->popup_centered_ratio();
+			}
+
+
+		} break;
+		case FILE_REMOVE: {
+
+			Vector<String> torem;
+
+			for(int i=0;i<files->get_item_count();i++) {
+
+				String path = files->get_item_metadata(i);
+				if (path.ends_with("/") || !files->is_selected(i))
+					continue;
+				torem.push_back(path);
+			}
+
+			if (torem.empty()) {
+				EditorNode::get_singleton()->show_warning("No files selected!");
+				break;
+			}
+
+			remove_dialog->show(torem);
+			//1) find if used
+			//2) warn
+
+		} break;
+		case FILE_INFO: {
+
+		} break;
+
+	}
+}
+
+void ScenesDock::_open_pressed(){
+
+
+	if (tree_mode) {
+
+		TreeItem *sel = tree->get_selected();
+		if (!sel) {
+			return;
+		}
+		path = sel->get_metadata(0);
+		/*if (path!="res://" && path.ends_with("/")) {
+			path=path.substr(0,path.length()-1);
 		}*/
 
-		editor->load_resource(path);
+		tree_mode=false;
+
+		tree->hide();
+		files->show();
+		path_hb->show();
+		button_favorite->hide();
+		button_fav_up->hide();
+		button_fav_down->hide();
+		button_instance->show();
+		button_open->show();
+		file_options->show();
+
+		_update_files(false);
+
+		current_path->set_text(path);
+
+		_push_to_history();
+
+
+	} else {
+
+		int idx=-1;
+		for(int i=0;i<files->get_item_count();i++) {
+			if (files->is_selected(i)) {
+				idx=i;
+				break;
+			}
+		}
+
+		if (idx<0)
+			return;
+
+
+
+		String path = files->get_item_metadata(idx);
+
+		if (path.ends_with("/")) {
+			if (path!="res://") {
+				path=path.substr(0,path.length()-1);
+			}
+			this->path=path;
+			_update_files(false);
+			current_path->set_text(path);
+			_push_to_history();
+		} else {
+
+			if (ResourceLoader::get_resource_type(path)=="PackedScene") {
+
+				editor->open_request(path);
+			} else {
+
+				editor->load_resource(path);
+			}
+		}
 	}
 
 //	emit_signal("open",path);
 
 }
 
-void ScenesDock::_save_favorites() {
-
-	String path = Globals::get_singleton()->get_resource_path()+"/favorites.cfg";
-	FileAccess *f=FileAccess::open(path,FileAccess::WRITE);
-	ERR_FAIL_COND(!f);
-	for(Set<String>::Element *E=favorites.front();E;E=E->next() ) {
-
-		CharString utf8f = E->get().utf8();
-		f->store_buffer((const uint8_t*)utf8f.get_data(),utf8f.length());
-		f->store_8('\n');
-	}
-
-	f->close();
-	memdelete(f);
-}
 
 void ScenesDock::_rescan() {
 
+	_set_scannig_mode();
 	EditorFileSystem::get_singleton()->scan();
+
+}
+
+void ScenesDock::fix_dependencies(const String& p_for_file) {
+	deps_editor->edit(p_for_file);
+}
+
+void ScenesDock::open(const String& p_path) {
+
+
+	String npath;
+	String nfile;
+
+	if (p_path.ends_with("/")) {
+
+		if (p_path!="res://")
+			npath=p_path.substr(0,p_path.length()-1);
+		else
+			npath="res://";
+	} else {
+		nfile=p_path.get_file();
+		npath=p_path.get_base_dir();
+	}
+
+	path=npath;
+
+	if (tree_mode && nfile=="") {
+		_update_tree();
+		tree->grab_focus();
+		tree->call_deferred("ensure_cursor_is_visible");
+		_push_to_history();
+		return;
+	} else if (tree_mode){
+		_update_tree();
+		tree->grab_focus();
+		tree->ensure_cursor_is_visible();
+		_open_pressed();
+		current_path->set_text(path);
+	} else {
+		_update_files(false);
+		_push_to_history();
+	}
+
+	for(int i=0;i<files->get_item_count();i++) {
+
+		String md = files->get_item_metadata(i);
+		if (md==p_path) {
+			files->select(i,true);
+			files->ensure_current_is_visible();
+			break;
+		}
+	}
+
 }
 
 void ScenesDock::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("_update_tree"),&ScenesDock::_update_tree);
 	ObjectTypeDB::bind_method(_MD("_rescan"),&ScenesDock::_rescan);
-	ObjectTypeDB::bind_method(_MD("_favorites_toggled"),&ScenesDock::_favorites_toggled);
-	ObjectTypeDB::bind_method(_MD("_favorite_toggled"),&ScenesDock::_favorite_toggled);
+	ObjectTypeDB::bind_method(_MD("_favorites_pressed"),&ScenesDock::_favorites_pressed);
 	ObjectTypeDB::bind_method(_MD("_instance_pressed"),&ScenesDock::_instance_pressed);
 	ObjectTypeDB::bind_method(_MD("_open_pressed"),&ScenesDock::_open_pressed);
-	ObjectTypeDB::bind_method(_MD("_save_favorites"),&ScenesDock::_save_favorites);
+
+	ObjectTypeDB::bind_method(_MD("_thumbnail_done"),&ScenesDock::_thumbnail_done);
+	ObjectTypeDB::bind_method(_MD("_select_file"), &ScenesDock::_select_file);
+	ObjectTypeDB::bind_method(_MD("_go_to_tree"), &ScenesDock::_go_to_tree);
+	ObjectTypeDB::bind_method(_MD("_go_to_dir"), &ScenesDock::_go_to_dir);
+	ObjectTypeDB::bind_method(_MD("_change_file_display"), &ScenesDock::_change_file_display);
+	ObjectTypeDB::bind_method(_MD("_fw_history"), &ScenesDock::_fw_history);
+	ObjectTypeDB::bind_method(_MD("_bw_history"), &ScenesDock::_bw_history);
+	ObjectTypeDB::bind_method(_MD("_fs_changed"), &ScenesDock::_fs_changed);
+	ObjectTypeDB::bind_method(_MD("_dir_selected"), &ScenesDock::_dir_selected);
+	ObjectTypeDB::bind_method(_MD("_fav_up_pressed"), &ScenesDock::_fav_up_pressed);
+	ObjectTypeDB::bind_method(_MD("_fav_down_pressed"), &ScenesDock::_fav_down_pressed);
+	ObjectTypeDB::bind_method(_MD("_file_option"), &ScenesDock::_file_option);
+	ObjectTypeDB::bind_method(_MD("_move_operation"), &ScenesDock::_move_operation);
+	ObjectTypeDB::bind_method(_MD("_rename_operation"), &ScenesDock::_rename_operation);
 
 	ADD_SIGNAL(MethodInfo("instance"));
 	ADD_SIGNAL(MethodInfo("open"));
@@ -271,47 +1078,152 @@ ScenesDock::ScenesDock(EditorNode *p_editor) {
 	HBoxContainer *toolbar_hbc = memnew( HBoxContainer );
 	add_child(toolbar_hbc);
 
+	button_hist_prev = memnew( ToolButton );
+	toolbar_hbc->add_child(button_hist_prev);
+	button_hist_prev->set_disabled(true);
+	button_hist_prev->set_tooltip("Previous Directory");
+
+	button_hist_next = memnew( ToolButton );
+	toolbar_hbc->add_child(button_hist_next);
+	button_hist_next->set_disabled(true);
+	button_hist_prev->set_focus_mode(FOCUS_NONE);
+	button_hist_next->set_focus_mode(FOCUS_NONE);
+	button_hist_next->set_tooltip("Next Directory");
+
 	button_reload = memnew( Button );
 	button_reload->set_flat(true);
 	button_reload->connect("pressed",this,"_rescan");	
 	toolbar_hbc->add_child(button_reload);
+	button_reload->set_focus_mode(FOCUS_NONE);
+	button_reload->set_tooltip("Re-Scan Filesystem");
+
+	toolbar_hbc->add_spacer();
+
+	button_fav_up = memnew( ToolButton );
+	button_fav_up->set_flat(true);
+	toolbar_hbc->add_child(button_fav_up);
+	button_fav_up->set_disabled(true);
+	button_fav_up->connect("pressed",this,"_fav_up_pressed");
+	button_fav_up->set_tooltip("Move Favorite Up");
+
+	button_fav_down = memnew( ToolButton );
+	button_fav_down->set_flat(true);
+	toolbar_hbc->add_child(button_fav_down);
+	button_fav_down->set_disabled(true);
+	button_fav_down->connect("pressed",this,"_fav_down_pressed");
+	button_fav_down->set_tooltip("Move Favorite Down");
 
 	button_favorite = memnew( Button );
 	button_favorite->set_flat(true);
 	button_favorite->set_toggle_mode(true);
-	button_favorite->connect("toggled",this,"_favorites_toggled");
+	button_favorite->connect("pressed",this,"_favorites_pressed");
 	toolbar_hbc->add_child(button_favorite);
+	button_favorite->set_tooltip("Toggle folder status as Favorite");
+
+	button_favorite->set_focus_mode(FOCUS_NONE);
+	button_fav_up->set_focus_mode(FOCUS_NONE);
+	button_fav_down->set_focus_mode(FOCUS_NONE);
 
-	toolbar_hbc->add_spacer();
 
 	button_open = memnew( Button );
 	button_open->set_flat(true);
 	button_open->connect("pressed",this,"_open_pressed");
 	toolbar_hbc->add_child(button_open);
+	button_open->hide();
+	button_open->set_focus_mode(FOCUS_NONE);
+	button_open->set_tooltip("Open the selected file.\nOpen as scene if a scene, or as resource otherwise.");
+
 
 	button_instance = memnew( Button );
 	button_instance->set_flat(true);
 	button_instance->connect("pressed",this,"_instance_pressed");
 	toolbar_hbc->add_child(button_instance);
+	button_instance->hide();
+	button_instance->set_focus_mode(FOCUS_NONE);
+	button_instance->set_tooltip("Instance the selected scene(s) as child of the selected node.");
+
+
+	file_options = memnew( MenuButton );
+	toolbar_hbc->add_child(file_options);
+	file_options->get_popup()->add_item("Rename or Move",FILE_MOVE);
+	file_options->get_popup()->add_item("Delete",FILE_REMOVE);
+	file_options->get_popup()->add_separator();
+	file_options->get_popup()->add_item("Edit Dependencies",FILE_DEPENDENCIES);
+	file_options->get_popup()->add_item("View Owners",FILE_OWNERS);
+	//file_options->get_popup()->add_item("Info",FILE_INFO);
+	file_options->hide();
+	file_options->set_focus_mode(FOCUS_NONE);
+	file_options->set_tooltip("Miscenaneous options related to resources on disk.");
 
 	tree = memnew( Tree );
-	tree_filter=memnew( ScenesDockFilter() );
-	tree_filter->connect("filter_changed", this, "_update_tree");
-	add_child(tree_filter);
+
+	tree->set_hide_root(true);
 	add_child(tree);
 
+
 	tree->set_v_size_flags(SIZE_EXPAND_FILL);
 	tree->connect("item_edited",this,"_favorite_toggled");
 	tree->connect("item_activated",this,"_open_pressed");
+	tree->connect("cell_selected",this,"_dir_selected");
 
-	timer = memnew( Timer );
-	timer->set_one_shot(true);
-	timer->set_wait_time(2);
-	timer->connect("timeout",this,"_save_favorites");
-	add_child(timer);
+	files = memnew( ItemList );
+	files->set_v_size_flags(SIZE_EXPAND_FILL);
+	files->set_select_mode(ItemList::SELECT_MULTI);
 
+	path_hb = memnew( HBoxContainer );
+	button_back  = memnew( ToolButton );
+	path_hb->add_child(button_back);
+	current_path=memnew( LineEdit );
+	current_path->set_h_size_flags(SIZE_EXPAND_FILL);
+	path_hb->add_child(current_path);
+	display_mode = memnew( ToolButton );
+	path_hb->add_child(display_mode);
+	display_mode->set_toggle_mode(true);
+	add_child(path_hb);
+	path_hb->hide();
+
+
+	add_child(files);
+	files->hide();
+
+	scanning_vb = memnew( VBoxContainer );
+	Label *slabel = memnew( Label );
+	slabel->set_text("Scanning Files,\nPlease Wait..");
+	slabel->set_align(Label::ALIGN_CENTER);
+	scanning_vb->add_child(slabel);
+	scanning_progress = memnew( ProgressBar );
+	scanning_vb->add_child(scanning_progress);
+	add_child(scanning_vb);
+	scanning_vb->hide();
+
+
+
+	deps_editor = memnew( DependencyEditor );
+	add_child(deps_editor);
+
+	owners_editor = memnew( DependencyEditorOwners);
+	add_child(owners_editor);
+
+	remove_dialog = memnew( DependencyRemoveDialog);
+	add_child(remove_dialog);
+
+	move_dialog = memnew( EditorDirDialog );
+	add_child(move_dialog);	
+	move_dialog->connect("dir_selected",this,"_move_operation");
+	move_dialog->get_ok()->set_text("Move");
+	
+	rename_dialog = memnew( EditorFileDialog );
+	rename_dialog->set_mode(EditorFileDialog::MODE_SAVE_FILE);
+	rename_dialog->connect("file_selected",this,"_rename_operation");
+	add_child(rename_dialog);
 
 	updating_tree=false;
+	initialized=false;
+
+	history.push_back("res://");
+	history_pos=0;
+	tree_mode=true;
+
 
 }
 
@@ -319,105 +1231,3 @@ ScenesDock::~ScenesDock() {
 
 }
 
-void ScenesDockFilter::_setup_filters() {
-
-	filter_option->clear();
-	filter_option->add_item("Path");
-	filter_option->add_item("Name");
-	filter_option->add_item("Folder");
-#if 0
-	List<String> extensions;
-	ResourceLoader::get_recognized_extensions_for_type("",&extensions);
-
-	file_filter->add_item("All Files (*)");
-	filters.push_back("*");
-
-	List<String> filter_texts;
-	for(int i=0;i<extensions.size();i++) {
-		filter_texts.push_back("*."+extensions[i]+" ; "+extensions[i].to_upper());
-		filters.push_back(extensions[i]);
-	}
-	for(int i=0;i<filter_texts.size();i++) {
-
-		String flt=filter_texts[i].get_slice(";",0).strip_edges();
-		String desc=filter_texts[i].get_slice(";",1).strip_edges();
-		if (desc.length())
-			file_filter->add_item(desc+" ( "+flt+" )");
-		else
-			file_filter->add_item("( "+flt+" )");
-	}
-#endif
-}
-
-void ScenesDockFilter::_command(int p_command) {
-	switch (p_command) {
-
-		case CMD_CLEAR_FILTER: {
-			if (search_box->get_text()!="") {
-				search_box->clear();
-				emit_signal("filter_changed");
-			}
-		}break;
-	}
-}
-
-void ScenesDockFilter::_search_text_changed(const String &p_newtext) {
-	emit_signal("filter_changed");
-}
-
-String ScenesDockFilter::get_search_term() {
-	return search_box->get_text().strip_edges();
-}
-
-ScenesDockFilter::FilterOption ScenesDockFilter::get_file_filter() {
-	return _current_filter;
-}
-
-void ScenesDockFilter::_file_filter_selected(int p_idx) {
-	FilterOption selected = (FilterOption)(filter_option->get_selected());
-	if (_current_filter != selected ) {
-		_current_filter = selected;
-		emit_signal("filter_changed");
-	}
-}
-
-void ScenesDockFilter::_notification(int p_what) {
-	switch(p_what) {
-		case NOTIFICATION_ENTER_TREE: {
-			clear_search_button->set_icon(get_icon("CloseHover","EditorIcons"));
-		} break;
-	}
-}
-
-void ScenesDockFilter::_bind_methods() {
-
-	ObjectTypeDB::bind_method(_MD("_command"),&ScenesDockFilter::_command);
-	ObjectTypeDB::bind_method(_MD("_search_text_changed"), &ScenesDockFilter::_search_text_changed);
-	ObjectTypeDB::bind_method(_MD("_file_filter_selected"), &ScenesDockFilter::_file_filter_selected);
-
-	ADD_SIGNAL( MethodInfo("filter_changed") );
-}
-
-ScenesDockFilter::ScenesDockFilter() {
-
-	_current_filter = FILTER_PATH;
-
-	filter_option = memnew( OptionButton );
-	filter_option->set_custom_minimum_size(Size2(60,10));
-	filter_option->set_clip_text(true);
-	filter_option->connect("item_selected", this, "_file_filter_selected");
-	add_child(filter_option);
-
-	_setup_filters();
-
-	search_box = memnew( LineEdit );
-	search_box->connect("text_changed",this,"_search_text_changed");
-	search_box->set_h_size_flags(SIZE_EXPAND_FILL);
-	add_child(search_box);
-
-	clear_search_button = memnew( ToolButton );
-	clear_search_button->connect("pressed",this,"_command",make_binds(CMD_CLEAR_FILTER));
-	add_child(clear_search_button);
-
-}
-
diff --git a/tools/editor/scenes_dock.h b/tools/editor/scenes_dock.h
index de7ab51edc0..d045124bf77 100644
--- a/tools/editor/scenes_dock.h
+++ b/tools/editor/scenes_dock.h
@@ -36,40 +36,112 @@
 #include "scene/gui/tool_button.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/box_container.h"
+#include "scene/gui/menu_button.h"
+#include "scene/gui/item_list.h"
+#include "scene/gui/progress_bar.h"
+
 #include "os/dir_access.h"
 #include "os/thread.h"
 
 #include "editor_file_system.h"
-
+#include "editor_dir_dialog.h"
+#include "dependency_editor.h"
 
 class EditorNode;
 
-class ScenesDockFilter;
+
 class ScenesDock : public VBoxContainer {
 	OBJ_TYPE( ScenesDock, VBoxContainer );
 
+	enum FileMenu {
+		FILE_DEPENDENCIES,
+		FILE_OWNERS,
+		FILE_MOVE,
+		FILE_REMOVE,
+		FILE_REIMPORT,
+		FILE_INFO
+	};
+
+
+	VBoxContainer *scanning_vb;
+	ProgressBar *scanning_progress;
+
 	EditorNode *editor;
 	Set<String> favorites;
 
 	Button *button_reload;
 	Button *button_instance;
 	Button *button_favorite;
+	Button *button_fav_up;
+	Button *button_fav_down;
 	Button *button_open;
-	Timer *timer;
+	Button *button_back;
+	Button *display_mode;
+	Button *button_hist_next;
+	Button *button_hist_prev;
+	LineEdit *current_path;
+	HBoxContainer *path_hb;
 
-	ScenesDockFilter *tree_filter;
+	MenuButton *file_options;
+
+
+	DependencyEditor *deps_editor;
+	DependencyEditorOwners *owners_editor;
+	DependencyRemoveDialog *remove_dialog;
+
+	EditorDirDialog *move_dialog;
+	EditorFileDialog *rename_dialog;
+
+	Vector<String> move_dirs;
+	Vector<String> move_files;
+
+
+	Vector<String> history;
+	int history_pos;
+
+	String path;
+
+	bool initialized;
 
 	bool updating_tree;
-	Tree * tree;
-	bool _create_tree(TreeItem *p_parent,EditorFileSystemDirectory *p_dir);
+	Tree * tree; //directories
+	ItemList *files;
 
+	bool tree_mode;
+
+	void _go_to_tree();
+	void _go_to_dir(const String& p_dir);
+	void _select_file(int p_idx);
+
+	bool _create_tree(TreeItem *p_parent,EditorFileSystemDirectory *p_dir);
+	void _thumbnail_done(const String& p_path,const Ref<Texture>& p_preview, const Variant& p_udata);
+	void _find_inside_move_files(EditorFileSystemDirectory *efsd,Vector<String>& files);
+	void _find_remaps(EditorFileSystemDirectory *efsd,Map<String,String> &renames,List<String>& to_remaps);
+
+	void _rename_operation(const String& p_to_path);
+	void _move_operation(const String& p_to_path);
+
+
+	void _file_option(int p_option);
+	void _update_files(bool p_keep_selection);
+	void _change_file_display();
+
+	void _fs_changed();
+	void _fw_history();
+	void _bw_history();
+	void _push_to_history();
+
+	void _fav_up_pressed();
+	void _fav_down_pressed();
+	void _dir_selected();
 	void _update_tree();
 	void _rescan();
-	void _favorites_toggled(bool);
-	void _favorite_toggled();
+	void _set_scannig_mode();
+
+	void _favorites_pressed();	
 	void _instance_pressed();
 	void _open_pressed();
-	void _save_favorites();
+
 
 protected:
 	void _notification(int p_what);
@@ -77,48 +149,14 @@ protected:
 public:
 
 	String get_selected_path() const;
+	void open(const String& p_path);
+
+	void fix_dependencies(const String& p_for_file);
+
 
 	ScenesDock(EditorNode *p_editor);
 	~ScenesDock();
 };
 
-class ScenesDockFilter : public HBoxContainer {
-
-	OBJ_TYPE( ScenesDockFilter, HBoxContainer );
-
-private:
-	friend class ScenesDock;
-
-	enum Command {
-		CMD_CLEAR_FILTER,
-	};
-
-	Tree *tree;
-	OptionButton *filter_option;
-	LineEdit *search_box;
-	ToolButton *clear_search_button;
-
-	enum FilterOption {
-		FILTER_PATH, // NAME or Folder
-		FILTER_NAME,
-		FILTER_FOLDER,
-	};
-	FilterOption _current_filter;
-	//Vector<String> filters;
-
-	void _command(int p_command);
-	void _search_text_changed(const String& p_newtext);
-	void _setup_filters();
-	void _file_filter_selected(int p_idx);
-
-protected:
-	void _notification(int p_what);
-	static void _bind_methods();
-
-public:
-	String get_search_term();
-	FilterOption get_file_filter();
-	ScenesDockFilter();
-};
 
 #endif // SCENES_DOCK_H
diff --git a/version.py b/version.py
index c723dd2935c..284bda95201 100644
--- a/version.py
+++ b/version.py
@@ -1,7 +1,8 @@
 short_name="godot"
 name="Godot Engine"
-major=1
-minor=1
-status="stable"
+major=2
+minor=0
+status="alpha"
+