Merge branch 'master' of local repository into mglaubitz
Merge branch 'master' of local repository into mglaubitz
Merge branch 'master' into mglaubitz
Merge branch 'master' into mglaubitz
create: SQL schema
add: basic model
update: rename of conference_types