Merge branch 'master' into dev
Merge branch 'dev' of ssh://bbamsch.com:22583/~/dev/databases into dev
Merge branch 'dev' of https://github.com/Freaks32/gamevocate into dev-feature-gameview