ytterligare småfix
Merge branch 'master' of https://github.com/TeamPrego/Code

Conflicts:
	tjalve/createCompetition.js
	tjalve/createCompetition.php