Merge branches 'develop' and 'master'
change gid definition from 500 to phil
Merge branches 'develop' and 'master' into develop