more stuff
Merge branch 'master' of https://github.com/olabalboa/hubbabubba

Conflicts:
	CI-Parent/CI-GUI/karma.conf.js
	CI-Parent/CI-GUI/src/main/webapp/app/app.js
	CI-Parent/CI-GUI/src/main/webapp/app/index.html
	CI-Parent/CI-GUI/src/main/webapp/app/playerlist/playerlist.html
	CI-Parent/CI-GUI/src/main/webapp/app/playerlist/playerlist.js
	CI-Parent/CI-GUI/src/main/webapp/app/playerlist/playerlist_test.js