Merge pull request #217 from Eric-Brison/3.3

init 3.3 new database table organization
Review
Merge pull request #218 from txiki31/3.3

Review
use array for multi values