Merge branch 'development' into 'master'

Added environment resource to fix conda update exception ($SHELL = /bin/bash)

See merge request !8