merge
Merge branch 'master' of github.com:elmewo/armicroscope_renewal
Merge branch 'master' of github.com:elmewo/armicroscope_renewal
merge
Merge branch 'master' of github.com:elmewo/armicroscope_renewal
Merge branch 'ctk' of github.com:elmewo/armicroscope_renewal into ctk
always use the standard database directory