Backup 20140115

Finally finished up the map editor function.
Some major bug fixes as well.