Merge branch 'dev'
Merge pull request #191 from FWAJL/dev

New database with the tidied up schema
Issue#189

- database is now ready

- tabs.js uses the old version for some forms
Merge pull request #192 from FWAJL/master

master to dev