Populated database with Organizations
Merge branch 'master' into quicktest
Final tweaks