Update upsert.sql

Extended upsert functionality to other timeseriesdb tables
merge branches updated sql statements

Merge branch 'master' of github.com:mbannert/timeseriesdb into metainformation