changed so type is returned as ID
Merge branch 'master' into dev
changed response to no content on gamedata
uncomment crypt password