Merge branch 'master' of https://github.com/pluto-/Springtest

Conflicts:
	client/src/main/webapp/WEB-INF/vsl/layout.vsl
	player_resources/src/main/java/com/distributed/springtest/playerresources/PlayerResourcesController.java
Merge branch 'master' of https://github.com/pluto-/Springtest

Conflicts:
	client/src/main/resources/admin.properties