Awesome DB logic
Merge branch 'master' into thomas
Merge branch 'master' into thomas
Altered storyboard.