Merge branch 'master' into fix_db_credentials_security
Merge pull request #5 from RiotGames/fix_db_credentials_security

Fix db credentials security
Merge branch 'master' into nginx_web