Should have gotten all of them this time.
Merge remote-tracking branch 'origin/hotfix/issue157' into develop

* origin/hotfix/issue157:
  Should have gotten all of them this time.

Conflicts:
	src/lisong_mechlab/view/action/DeleteLoadoutAction.java
	src/lisong_mechlab/view/action/MaxArmorAction.java
	src/lisong_mechlab/view/action/RenameLoadoutAction.java