added redis, server config files and new sql
merge