users can logout
resolved merge conflict
fixed bug whereby database was incorrectly migrated each time rather than being upgraded