Merge origin/master

Conflicts:
	src/soundloop/Controller/Starter.java
Merge origin/master

Conflicts:
	src/soundloop/Controller/Starter.java
Merge origin/master

Conflicts:
	src/soundloop/Controller/Starter.java