Database support
Merge branch 'master' of https://github.com/cyber-waste/brighton-beach