Added to controllers
Merge branch 'master' into alex
Fixed db call
Merge pull request #88 from blind-squirrel/alex

Alex