Started fixing spring setup
Merge remote-tracking branch 'origin/master'

Conflicts:
	et-game/src/main/java/com/dalthow/etaron/Launcher.java