Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel'
Specify field lists for all selects where we had to add a primary key
to the table. There are still some wild card selects that need to be
cleaned up, but they are on tables that already have a primary key or
not on mysql tables.
Merge branch 'primekey' into devel