fixed autoinc and primary key in test db setup
arraylist to list
merged
Merge branch 'tmp'
fixies