Changed attributes & stuff - Jakob
Merge branch 'master' of https://github.com/Chr1211/TournamentApp.git

Conflicts:
	TournamentAdmin/source/dao/Dao.java