Converting usage of userid to user_id.
Merge branch 'dev-db' into dev
Converting use of 'userid' to 'user_id'.
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev