Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' of https://github.com/ARISGames/server into develop
updated gitignore
quick patch to augbubbles (typo)