Merging 1.9.1 source: actor changes (minus questgivers, they will be done separately)

src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java

@@ -183,7 +183,7 @@ public class Blacksmith extends NPC {
 			return "I don't work with cursed items!";
 		}
 		
-		if (item1.level < 0 || item2.level < 0) {
+		if (item1.level() < 0 || item2.level() < 0) {
 			return "It's a junk, the quality is too poor!";
 		}
 		
@@ -197,7 +197,7 @@ public class Blacksmith extends NPC {
 	public static void upgrade( Item item1, Item item2 ) {
 		
 		Item first, second;
-		if (item2.level > item1.level) {
+		if (item2.level() > item1.level()) {
 			first = item2;
 			second = item1;
 		} else {