Updated database schema.
Merge branch 'master' into new/tumblr
basic tumblr integration finished