modded server
Merge branch 'master' into guy_branch
DB changes
Merge branch 'master' into guy_branch
User can add competitions