Merge origin/master

Conflicts:
	src/GUI/HLAfterActionStory.form
	src/GUI/HLAfterActionStory.java
	src/GUI/MainView.form
	src/GUI/MainView.java
Merge origin/master

Conflicts:
	src/GUI/HLAfterActionStory.form
	src/GUI/HLAfterActionStory.java
	src/GUI/MainView.form
	src/GUI/MainView.java
Merge origin/master

Conflicts:
	src/BLL/BLLAppearance.java
	src/DAL/DALAppearance.java
	src/GUI/HLAfterAction.java
Merge origin/master

Conflicts:
	src/BLL/BLLAppearance.java
	src/DAL/DALAppearance.java
	src/GUI/HLAfterAction.java