hlafteraction1
Merge origin/master

Conflicts:
	test/BLL/BLLAppearanceTest.java