Replaced specific mention of wordpress database with variable name
fixed conflict in merging master with bug fix