Added edit function with retrieving of values
Added update function for game
Added editing of games
merging conflicts in jone-dev and master
Merge branch 'jone-dev'
merged master to jone-dev
Merge branch 'master' into jone-dev