update dependencies
merge develop into postgres