add id for table
conflict
Merge branch 'master' of https://github.com/Rawkcy/blingmail