Merge origin/master

Conflicts:
	src/GUI/ViewILIndsats.java
Merge origin/master