diff --git a/AndorsTrailEdit/test_angular/app.js b/AndorsTrailEdit/test_angular/app.js
deleted file mode 100644
index 7f56f273d..000000000
--- a/AndorsTrailEdit/test_angular/app.js
+++ /dev/null
@@ -1,6 +0,0 @@
-angular
-	.module('oskar1', [])
-    .config(['$routeProvider', function($routeProvider) {
-		$routeProvider
-			.when('/item/:id', {templateUrl: 'detail.html', controller: DetailCtrl});
-	}]);
diff --git a/AndorsTrailEdit/test_angular/controllers.js b/AndorsTrailEdit/test_angular/controllers.js
deleted file mode 100644
index 8ac59de3e..000000000
--- a/AndorsTrailEdit/test_angular/controllers.js
+++ /dev/null
@@ -1,33 +0,0 @@
-var ListOfItems = function(options) {
-	var o = {
-		idField: 'id'
-	};
-	angular.extend(o, options);
-
-	this.items = [];
-	this.findById = function(id) { 
-		for (var i = 0; i < this.items.length; ++i) {
-			var item = this.items[i];
-			if (item[o.idField] == id) return item;
-		}
-	};
-};
-
-var Model = { 
-	items: new ListOfItems() 
-};
-
-Model.items.items = [{id: 'a', name: 'test1'}, {id: 'b', name: 'test2'}];
-
-function ListCtrl($scope, $routeParams) {
-    $scope.items = Model.items.items;
-	$scope.add = function() {
-		
-	};
-}
-
-
-function DetailCtrl($scope, $routeParams) {
-	alert("newing DetailCtrl");
-    $scope.item = Model.items.findById($routeParams.id);
-}
diff --git a/AndorsTrailEdit/test_angular/detail.html b/AndorsTrailEdit/test_angular/detail.html
deleted file mode 100644
index 0ca4dfbe3..000000000
--- a/AndorsTrailEdit/test_angular/detail.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div>
-<p>id: {{item.id}}</p>
-<input type="text" ng-model="item.id"><br />
-<input type="text" ng-model="item.name"><br />
-</div>
diff --git a/AndorsTrailEdit/test_angular/partial1.html b/AndorsTrailEdit/test_angular/partial1.html
deleted file mode 100644
index 15c26649a..000000000
--- a/AndorsTrailEdit/test_angular/partial1.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div>
-<p>id1: {{obj.id}}</p>
-<input type="text" ng-model="obj.id">
-</div>
diff --git a/AndorsTrailEdit/test_angular/partial2.html b/AndorsTrailEdit/test_angular/partial2.html
deleted file mode 100644
index 075114b65..000000000
--- a/AndorsTrailEdit/test_angular/partial2.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div>
-<p>id2: {{obj.id}}</p>
-<input type="text" ng-model="obj.id">
-</div>
diff --git a/AndorsTrailEdit/test_angular/services.js b/AndorsTrailEdit/test_angular/services.js
deleted file mode 100644
index 2bfa28f7b..000000000
--- a/AndorsTrailEdit/test_angular/services.js
+++ /dev/null
@@ -1,8 +0,0 @@
-angular
-	.module('itemsService', ['ngResource'])
-	.factory('Item', function($resource) {
-		var items = [];
-		return $resource('phones/:phoneId.json', {}, {
-			query: {method:'GET', params:{phoneId:'phones'}, isArray:true}
-		});
-});
\ No newline at end of file
diff --git a/AndorsTrailEdit/test_angular/test.html b/AndorsTrailEdit/test_angular/test.html
deleted file mode 100644
index 452a9b16b..000000000
--- a/AndorsTrailEdit/test_angular/test.html
+++ /dev/null
@@ -1,24 +0,0 @@
-﻿<!DOCTYPE html>
-<html lang="en" ng-app="oskar1">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<link rel="stylesheet" type="text/css" href="styles2.css" />
-	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js"></script>
-	<script type="text/javascript" src="../inc/angular.min.js"></script> 
-	<script type="text/javascript" src="app.js"></script>
-	<script type="text/javascript" src="controllers.js"></script>
-</head>
-<body>
-
-
-<div ng-controller="ListCtrl">
-<ul ng-repeat="item in items">
-<li><a href="#/item/{{item.id}}">{{item.id}} : {{item.name}}</a></li>
-</ul>
-
-</div>
-
-<div ng-view></div>
-
-</body>
-</html>
diff --git a/AndorsTrailEdit/unittest.html b/AndorsTrailEdit/unittest.html
deleted file mode 100644
index c940fd1f7..000000000
--- a/AndorsTrailEdit/unittest.html
+++ /dev/null
@@ -1,479 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
-                    "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-	<title>Andor's Trail editor unit tests</title>
-	<link rel="stylesheet" href="http://code.jquery.com/qunit/git/qunit.css" type="text/css" media="screen" />
-	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js"></script>
-	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.11/jquery-ui.min.js"></script>
-	<script type="text/javascript" src="AndorsTrailEditor.js"></script>
-	<script type="text/javascript" src="inc/qunit.js"></script>
-	
-<script type="text/javascript">
-
-$(document).ready(function(){
-    
-	// ========================================================
-	
-	module("FieldList");
-
-		test("Deserialization of header", function() {
-			var header = "[Id|Name|Spells[SpellID|SpellName|]|Size|]";
-			var ds = new FieldList(header);
-			equals(ds._fields.length, 4);
-			equals(ds._fields[0], "Id");
-			equals(ds._fields[1], "Name");
-			equals(ds._fields[2]._name, "Spells");
-			equals(ds._fields[2]._fields.length, 2);
-			equals(ds._fields[2]._fields[0], "SpellID");
-			equals(ds._fields[2]._fields[1], "SpellName");
-			equals(ds._fields[3], "Size");
-		});
-		
-		test("Deserialization of header with multiple lists", function() {
-			var header = "[Id|Name|Spells[SpellID|SpellName|]|Size|Drops[ItemID|]|]";
-			var ds = new FieldList(header);
-			equals(ds._fields.length, 5);
-			equals(ds._fields[0], "Id");
-			equals(ds._fields[1], "Name");
-			equals(ds._fields[2]._name, "Spells");
-			equals(ds._fields[2]._fields.length, 2);
-			equals(ds._fields[2]._fields[0], "SpellID");
-			equals(ds._fields[2]._fields[1], "SpellName");
-			equals(ds._fields[3], "Size");
-			equals(ds._fields[4]._name, "Drops");
-			equals(ds._fields[4]._fields.length, 1);
-			equals(ds._fields[4]._fields[0], "ItemID");
-		});
-		
-		test("Serialization of header", function() {
-			var header = "[Id|Name|Spells[SpellID|SpellName|]|Size|]";
-			var ds = new FieldList(header);
-			equals(ds.getHeader(), header);
-			equals(ds.getHeaderLine(), header + ";");
-		});
-		
-		test("Finding header in text", function() {
-			var ds = findHeader("[Id|Name|[SpellID|SpellName|]|Size|];");
-			ok(ds);
-			equals(ds._fields.length, 4);
-			
-			ds = findHeader("[Id|Name|[SpellID|SpellName|]|Size|]");
-			ok(!ds);
-			
-			ds = findHeader("\n[Id|Name|[SpellID|SpellName|]|Size|];");
-			ok(ds);
-			equals(ds._fields.length, 4);
-			
-			ds = findHeader("\ntest\n[Id|Name|[SpellID|SpellName|]|Size|];");
-			ok(ds);
-			equals(ds._fields.length, 4);
-			
-			ds = findHeader("\ntest\n[Id|Name|[SpellID|SpellName|]|Size|];\ntest2\n");
-			ok(ds);
-			equals(ds._fields.length, 4);
-			
-			ds = findHeader("\ntest\n{Test|Foo|};\n[Id|Name|[SpellID|SpellName|]|Size|];\ntest2\n");
-			ok(ds);
-			equals(ds._fields.length, 4);
-			
-			ds = findHeader("\ntest\n[Id|Name|[SpellID|SpellName|]|Size|];\n{Test|Foo|};\n");
-			ok(ds);
-			equals(ds._fields.length, 4);
-		});
-	
-	// ========================================================
-	
-	module("deserializeObject");
-
-		test("Simple object deserialization", function() {
-			var ds = new FieldList("[Id|Name|SpellID|]");
-			var obj = deserializeObject(ds, "{23|TestObject|50|}");
-			ok(obj);
-			equals(obj.Id, 23);
-			equals(obj.Name, "TestObject");
-			equals(obj.SpellID, 50);
-		});
-
-		test("Hierarcical object deserialization", function() {
-			var ds = new FieldList("[Id|Name|Spells[SpellID|SpellName|]|Size|]");
-			var obj = deserializeObject(ds, "{23|TestObject|{{50|Heal|}{51|Curse|}}|Large|}");
-			ok(obj);
-			equals(obj.Id, 23);
-			equals(obj.Name, "TestObject");
-			ok(obj.Spells);
-			equals(obj.Spells.length, 2);
-			equals(obj.Spells[0].SpellID, 50);
-			equals(obj.Spells[0].SpellName, "Heal");
-			equals(obj.Spells[1].SpellID, 51);
-			equals(obj.Spells[1].SpellName, "Curse");
-			equals(obj.Size, "Large");
-		});
-
-		test("Multiple hierarcical object deserialization", function() {
-			var ds = new FieldList("[Id|Name|Spells[SpellID|SpellName|]|Size|Drops[ItemID|]|Effects[EffectID|]|]");
-			var obj = deserializeObject(ds, "{23|TestObject|{{50|Heal|}{51|Curse|}}|Large|{{4|}}||}");
-			ok(obj);
-			equals(obj.Id, 23);
-			equals(obj.Name, "TestObject");
-			ok(obj.Spells);
-			equals(obj.Spells.length, 2);
-			equals(obj.Spells[0].SpellID, 50);
-			equals(obj.Spells[0].SpellName, "Heal");
-			equals(obj.Spells[1].SpellID, 51);
-			equals(obj.Spells[1].SpellName, "Curse");
-			equals(obj.Size, "Large");
-			ok(obj.Drops);
-			equals(obj.Drops.length, 1);
-			equals(obj.Drops[0].ItemID, 4);
-			ok(obj.Effects);
-			equals(obj.Effects.length, 0);
-		});
-
-		test("Hierarcical object deserialization with whitespaces", function() {
-			var ds = new FieldList("[Id|Name|Spells[SpellID|SpellName|]|Size|]");
-			var obj = deserializeObject(ds, "{23|TestObject|{\n\t{50|Heal|}\n\t{51|Curse|}\n\t}|Large|}");
-			ok(obj);
-			equals(obj.Id, 23);
-			equals(obj.Name, "TestObject");
-			ok(obj.Spells);
-			equals(obj.Spells.length, 2);
-			equals(obj.Spells[0].SpellID, 50);
-			equals(obj.Spells[0].SpellName, "Heal");
-			equals(obj.Spells[1].SpellID, 51);
-			equals(obj.Spells[1].SpellName, "Curse");
-			equals(obj.Size, "Large");
-		});
-	
-	// ========================================================
-	
-	module("serializeObject");
-
-		test("Simple object serialization", function() {
-			var ds = new FieldList("[Id|Name|SpellID|]");
-			var obj = new Object();
-			obj.Id = 23;
-			obj.Name = "TestObject";
-			obj.SpellID = 50;
-			
-			equals(serializeObject(ds, obj), "{23|TestObject|50|}");
-		});
-
-		test("Hierarcical object serialization", function() {
-			var ds = new FieldList("[Id|Name|Spells[SpellID|SpellName|]|Size|]");
-			var obj = new Object();
-			obj.Id = 23;
-			obj.Name = "TestObject";
-			obj.Spells = [];
-			obj.Spells[0] = new Object();
-			obj.Spells[0].SpellID = 50;
-			obj.Spells[0].SpellName = "Heal";
-			obj.Spells[1] = new Object();
-			obj.Spells[1].SpellID = 51;
-			obj.Spells[1].SpellName = "Curse";
-			obj.Size = "Large";
-			
-			equals(serializeObject(ds, obj), "{23|TestObject|{\n\t{50|Heal|}\n\t{51|Curse|}\n\t}|Large|}");
-		});
-
-		test("Multiple hierarcical object serialization", function() {
-			var ds = new FieldList("[Id|Name|Spells[SpellID|SpellName|]|Size|Drops[ItemID|]|Effects[EffectID|]|]");
-			var obj = new Object();
-			obj.Id = 23;
-			obj.Name = "TestObject";
-			obj.Spells = [];
-			obj.Spells[0] = new Object();
-			obj.Spells[0].SpellID = 50;
-			obj.Spells[0].SpellName = "Heal";
-			obj.Spells[1] = new Object();
-			obj.Spells[1].SpellID = 51;
-			obj.Spells[1].SpellName = "Curse";
-			obj.Size = "Large";
-			obj.Drops = [];
-			obj.Drops[0] = new Object();
-			obj.Drops[0].ItemID = 4;
-			obj.Effects = [];
-			
-			equals(serializeObject(ds, obj), "{23|TestObject|{\n\t{50|Heal|}\n\t{51|Curse|}\n\t}|Large|{{4|}}||}");
-		});
-		
-		test("Object serialization with undefined fields", function() {
-			var ds = new FieldList("[Id|Name|SpellID|]");
-			var obj = new Object();
-			obj.Name = "TestObject";
-			obj.SpellID = 50;
-			
-			equals(serializeObject(ds, obj), "{|TestObject|50|}");
-		});
-	
-	// ========================================================
-	
-	module("serializeObjectList");
-
-		test("Simple object serialization", function() {
-			var ds = new FieldList("[Id|Name|SpellID|]");
-			var list = [];
-			var obj = new Object();
-			obj.Id = 23;
-			obj.Name = "TestObject";
-			obj.SpellID = 50;
-			list[0] = obj;
-			obj = new Object();
-			obj.Id = 25;
-			obj.Name = "Foo";
-			obj.SpellID = 9;
-			list[1] = obj;
-			
-			equals(serializeObjectList(ds, list), "[Id|Name|SpellID|];\n{23|TestObject|50|};\n{25|Foo|9|};\n");
-		});
-
-		test("Serialize empty list", function() {
-			var ds = new FieldList("[Id|Name|SpellID|]");
-			var list = [];
-			equals(serializeObjectList(ds, list), "[Id|Name|SpellID|];\n");
-		});
-	
-	// ========================================================
-	
-	module("deserializeObjectList");
-
-		test("Simple object deserialization", function() {
-			var ds = new FieldList("[Id|Name|SpellID|]");
-			var list = deserializeObjectList(ds, "{23|TestObject|50|};\n{25|Foo|9|};");
-			ok(list);
-			equals(list.length, 2);
-			
-			var obj = list[0];
-			ok(obj);
-			equals(obj.Id, 23);
-			equals(obj.Name, "TestObject");
-			equals(obj.SpellID, 50);
-			
-			var obj = list[1];
-			ok(obj);
-			equals(obj.Id, 25);
-			equals(obj.Name, "Foo");
-			equals(obj.SpellID, 9);
-		});
-
-		test("Deserialize empty list", function() {
-			var ds = new FieldList("[Id|Name|SpellID|]");
-			var list = deserializeObjectList(ds, "");
-			ok(list);
-			equals(list.length, 0);
-			
-			list = deserializeObjectList(ds, "test value};");
-			ok(list);
-			equals(list.length, 0);
-		});
-
-		test("Deserialize garbage values", function() {
-			var ds = new FieldList("[Id|Name|SpellID|]");
-			var list = deserializeObjectList(ds, "test value};");
-			ok(list);
-			equals(list.length, 0);
-			
-			list = deserializeObjectList(ds, "{23|TestObject|50|};\nfoo\n\n{25|Foo|9|};\nbaz\n");
-			ok(list);
-			equals(list.length, 2);
-			
-			var obj = list[0];
-			ok(obj);
-			equals(obj.Id, 23);
-			equals(obj.Name, "TestObject");
-			equals(obj.SpellID, 50);
-			
-			var obj = list[1];
-			ok(obj);
-			equals(obj.Id, 25);
-			equals(obj.Name, "Foo");
-			equals(obj.SpellID, 9);
-		});
-		
-	// ========================================================
-	
-	module("Combined serialization");
-
-		test("Serialization -> deserialization", function() {
-			var ds = new FieldList("[Id|Name|Spells[SpellID|SpellName|]|Size|Drops[ItemID|]|Effects[EffectID|]|]");
-			var obj = new Object();
-			obj.Id = 23;
-			obj.Name = "TestObject";
-			obj.Spells = [];
-			obj.Spells[0] = new Object();
-			obj.Spells[0].SpellID = 50;
-			obj.Spells[0].SpellName = "Heal";
-			obj.Spells[1] = new Object();
-			obj.Spells[1].SpellID = 51;
-			obj.Spells[1].SpellName = "Curse";
-			obj.Size = "Large";
-			obj.Drops = [];
-			obj.Drops[0] = new Object();
-			obj.Drops[0].ItemID = 4;
-			obj.Effects = [];
-			
-			
-			var obj = deserializeObject(ds, serializeObject(ds, obj));
-			ok(obj);
-			equals(obj.Id, 23);
-			equals(obj.Name, "TestObject");
-			ok(obj.Spells);
-			equals(obj.Spells.length, 2);
-			equals(obj.Spells[0].SpellID, 50);
-			equals(obj.Spells[0].SpellName, "Heal");
-			equals(obj.Spells[1].SpellID, 51);
-			equals(obj.Spells[1].SpellName, "Curse");
-			equals(obj.Size, "Large");
-			ok(obj.Drops);
-			equals(obj.Drops.length, 1);
-			equals(obj.Drops[0].ItemID, 4);
-			ok(obj.Effects);
-			equals(obj.Effects.length, 0);
-			
-		});
-	
-	// ========================================================
-	
-	module("Regex test");
-
-		test("test1", function() {
-			var expression = /'/gm;
-			var str = "Test'value'";
-			
-			var str2 = str.replace(expression, '_');
-			equals(str2, "Test_value_");
-			
-			str2 = str.replace(expression, "\\'");
-			equals(str2, "Test\\'value\\'");
-			
-		});
-		
-	// ========================================================
-	
-	module("Serialization and deserialization with special characters");
-
-		test("Serialization of newline", function() {
-			var ds = new FieldList("[Id|Name|SpellID|]");
-			var obj = new Object();
-			obj.Id = 3;
-			obj.Name = "Test\nObject\nValue";
-			obj.SpellID = 50;
-			
-			equals(serializeObject(ds, obj), "{3|Test\\nObject\\nValue|50|}");
-		});
-		
-		test("Deserialization of newline", function() {
-			var ds = new FieldList("[Id|Name|SpellID|]");
-			var obj = deserializeObject(ds, "{3|Test\\nObject\\nValue|50|}");
-			ok(obj);
-			equals(obj.Id, 3);
-			equals(obj.Name, "Test\nObject\nValue");
-			equals(obj.SpellID, 50);
-		});
-		
-		test("Serialization of single quote", function() {
-			var ds = new FieldList("[Id|Name|SpellID|]");
-			var obj = new Object();
-			obj.Id = 3;
-			obj.Name = "Test 'Object'";
-			obj.SpellID = 50;
-			
-			equals(serializeObject(ds, obj), "{3|Test \\'Object\\'|50|}");
-		});
-		
-		test("Deserialization of single quote", function() {
-			var ds = new FieldList("[Id|Name|SpellID|]");
-			var obj = deserializeObject(ds, "{3|Test \\'Object\\'|50|}");
-			ok(obj);
-			equals(obj.Id, 3);
-			equals(obj.Name, "Test 'Object'");
-			equals(obj.SpellID, 50);
-		});
-
-	// ========================================================
-	
-	module("DataStore");
-
-		test("Getting and putting items", function() {
-			var ds = new DataStore({objectTypename: 'item', fieldList: new FieldList("[iconID|name|];")});
-			equals(ds.items.length, 0);
-			ds.add({iconID: 3, name: 'Test'});
-			equals(ds.items.length, 1);
-			equals(ds.items[0].iconID, 3);
-			equals(ds.items[0].name, 'Test');
-		});
-		
-		test("Serialization of datastore", function() {
-			var ds = new DataStore({objectTypename: 'item', fieldList: new FieldList("[iconID|name|];")});
-			ds.add({iconID: 3, name: 'Test'});
-			equals(ds.serialize(), '[iconID|name|];\n{3|Test|};\n');
-		});
-
-	// ========================================================
-	
-	module("TilesetImage");
-
-		test("Image bounds", function() {
-			var img = new TilesetImage("defaultimage.png", { x:1, y:1 });
-			equals(img._tileSize.x, 32);
-			equals(img._tileSize.y, 32);
-			
-			var c = img.localIDToCoords(0);
-			equals(img.coordsToLocalID(c.x, c.y), 0);
-			equals(c.x, 0);
-			equals(c.y, 0);
-			equals(img.coordsToLocalID(0, 0), 0);
-			equals(img.coordsToLocalID(1, 1), 0);
-			equals(img.coordsToLocalID(10, 10), 0);
-			equals(img.coordsToLocalID(31, 31), 0);
-			
-			img = new TilesetImage("defaultimage.png", { x:10, y:2 });
-			c = img.localIDToCoords(0);
-			equals(img.coordsToLocalID(c.x, c.y), 0);
-			equals(c.x, 0);
-			equals(c.y, 0);
-			equals(img.coordsToLocalID(0, 0), 0);
-			equals(img.coordsToLocalID(1, 1), 0);
-			equals(img.coordsToLocalID(10, 10), 0);
-			equals(img.coordsToLocalID(31, 31), 0);
-			
-			c = img.localIDToCoords(1);
-			equals(img.coordsToLocalID(c.x, c.y), 1);
-			equals(c.x, 32);
-			equals(c.y, 0);
-			equals(img.coordsToLocalID(32, 0), 1);
-			equals(img.coordsToLocalID(33, 1), 1);
-			equals(img.coordsToLocalID(40, 10), 1);
-			equals(img.coordsToLocalID(63, 31), 1);
-			
-			c = img.localIDToCoords(10);
-			equals(img.coordsToLocalID(c.x, c.y), 10);
-			equals(c.x, 0);
-			equals(c.y, 32);
-			equals(img.coordsToLocalID(0, 32), 10);
-			equals(img.coordsToLocalID(1, 33), 10);
-			equals(img.coordsToLocalID(10, 40), 10);
-			equals(img.coordsToLocalID(31, 63), 10);
-			
-			c = img.localIDToCoords(12);
-			equals(img.coordsToLocalID(c.x, c.y), 12);
-			equals(c.x, 64);
-			equals(c.y, 32);
-			equals(img.coordsToLocalID(64, 32), 12);
-			equals(img.coordsToLocalID(65, 33), 12);
-			equals(img.coordsToLocalID(70, 40), 12);
-			equals(img.coordsToLocalID(95, 63), 12);
-		});
-});
-</script>
-  
-</head>
-<body>
-	<h1 id="qunit-header">Andor's Trail editor unit tests</h1>
-	<h2 id="qunit-banner"></h2>
-	<div id="qunit-testrunner-toolbar"></div>
-	<h2 id="qunit-userAgent"></h2>
-	<ol id="qunit-tests"></ol>
-	<div id="qunit-fixture">test markup, will be hidden</div>
-</body>
-</html>
