Merge branch 'master' of https://github.com/AgreementMakerLight/AML-Project.git

AgreementMakerLight/src/aml/Main.java

@@ -372,7 +372,7 @@ public class Main
 				{
 					if(option[1].equalsIgnoreCase("none"))
 						continue;
-					selection.add(MatchStep.PROPERTY);
+					selection.add(MatchStep.SELECT);
 					if(!option[1].equalsIgnoreCase("auto"))
 						aml.setSelectionType(SelectionType.parseSelector(option[1]));
 				}
@@ -383,6 +383,7 @@ public class Main
 				}
 			}
 			in.close();
+			aml.setMatchSteps(selection);
 		}
 		catch(Exception e)
 		{

AgreementMakerLight/src/aml/ui/AlignmentPanel.java

@@ -203,10 +203,10 @@ public class AlignmentPanel extends JInternalFrame implements ActionListener, It
 			setIncorrect.setBackground(AMLColor.RED);
 			setIncorrect.setPreferredSize(new Dimension(110,28));
 			setIncorrect.addActionListener(this);
-			sortAsc = new JButton("Sort ↑");
+			sortAsc = new JButton("Sort \u2191");
 			sortAsc.setPreferredSize(new Dimension(110,28));
 			sortAsc.addActionListener(this);
-			sortDes = new JButton("Sort ↓");
+			sortDes = new JButton("Sort \u2193");
 			sortDes.setPreferredSize(new Dimension(110,28));
 			sortDes.addActionListener(this);
 			search = new JButton("Search");